From a4ce4124c5dcb1b62a4ab68650933fd8603c6983 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 12 Nov 2024 13:19:24 +0800 Subject: [PATCH] =?UTF-8?q?YT-720WMS11.=E7=89=A9=E6=96=99=E8=A1=A5?= =?UTF-8?q?=E6=89=93=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/purchasePackage/index.vue | 26 +- .../purchasePackage/purchasePackage.data.ts | 549 ++++++------------ 2 files changed, 195 insertions(+), 380 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index e0a18101c..a1ec4351f 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -70,6 +70,7 @@ import * as Itempackaging from '@/api/wms/itempackage' import { getJmreportBaseUrl } from '@/utils/systemParam' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import {getProductionlineitemPage} from "@/api/wms/productionlineitem"; const { loadStart, loadDone } = usePageLoading() // 采购标签 defineOptions({ name: 'PurchasePackage' }) @@ -107,20 +108,33 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row setV['itemDesc1'] = val[0]['desc1'] setV['itemDesc2'] = val[0]['desc2'] setV['uom'] = val[0]['uom'] - setV['produceDate'] = val[0]['activeTime'] - setV['expireDate'] = val[0]['expireTime'] - setV['validityDays'] = val[0]['validityDays'] - await Itempackaging.getItempackagingPage({ + setV['backNumber'] = val[0]['backNumber'] + setV['colorCode'] = val[0]['colorCode'] + setV['receivedNumber'] = val[0]['receivedNumber'] + setV['status'] = val[0]['status'] + setV['packQty'] = val[0]['defaultPackQty'] + setV['packUnit'] = val[0]['defaultPackUnit'] + + await getProductionlineitemPage({ itemCode: val[0]['code'] }).then(res => { if (res) { if (res.list.length > 0) { - setV['packQty'] = res.list[0].packQty - setV['packUnit'] = res.list[0].packUnit + setV['productionLine'] = res.list[0].productionLineCode } } }) } + if (formField == 'supplierCode') { + setV['supplierName'] = val[0]['name'] + } + if (formField == 'asnNumber') { + setV['purchaseOrderRemarks'] = val[0]['remark'] + } + if (formField == 'toDockCode') { + setV['receivedLocation'] = val[0]['name'] + setV['defaultReceivingArea'] = val[0]['remark'] + } basicFormRef.setValues(setV) }) } diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index e7920f846..75021aa2e 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -3,22 +3,14 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; -import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data"; -import * as WarehouseApi from "@/api/wms/warehouse"; import { Dock } from "@/views/wms/basicDataManage/factoryModeling/dock/dock.data"; import * as DockApi from "@/api/wms/dock"; -import { Location } from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; -import * as LocationApi from "@/api/wms/location"; import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data"; import * as SupplierApi from "@/api/wms/supplier"; -import { PurchaseMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data"; -import * as PurchaseMainApi from "@/api/wms/purchaseMain"; -import { PurchaseDetail } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data"; -import * as PurchaseDetailApi from "@/api/wms/purchaseDetail"; -import { PurchasePlanMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data"; -import * as PurchasePlanMainApi from "@/api/wms/purchasePlanMain"; import { SupplierdeliverRecordMain } from "@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data"; import * as SupplierdeliverRecordMainApi from "@/api/wms/supplierdeliverRecordMain"; +import * as ItemPackageApi from "@/api/wms/itempackage"; +import {Itempackaging} from "@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data"; // 表单校验 export const PackageRules = reactive({ @@ -251,7 +243,11 @@ export const PackageInventory = useCrudSchemas(reactive([ table: { width: 150, }, - isForm:false + form: { + componentProps:{ + disabled: true + } + }, }, { label: '物料描述1', @@ -260,7 +256,11 @@ export const PackageInventory = useCrudSchemas(reactive([ table: { width: 150, }, - isForm:false + form: { + componentProps:{ + disabled: true + } + }, }, { label: '物料描述2', @@ -269,112 +269,86 @@ export const PackageInventory = useCrudSchemas(reactive([ table: { width: 150, }, - isForm:false + form: { + componentProps:{ + disabled: true + } + }, }, { - label: '批次', - field: 'batch', + label: '背番', + field: 'backNumber', sort: 'custom', - isSearch: true, table: { width: 150, }, - }, - // { - // label: '替代批次', - // field: 'altBatch', - // sort: 'custom', - // table: { - // width: 150, - // }, - // }, - { - label: '生产日期', - field: 'produceDate', - sort: 'custom', - formatter: dateFormatter2, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD', - type: 'daterange', - disabled: true, - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', + componentProps:{ disabled: true } }, - table: { - width: 180, - }, }, { - label: '有效期(日)', - field: 'validityDays', + label: '色番', + field: 'colorCode', sort: 'custom', - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 0, - disabled: true - }, - value: 0 - }, table: { width: 150, }, + form: { + componentProps:{ + disabled: true + } + }, }, { - label: '失效日期', - field: 'expireDate', + label: '包装规格', + field: 'packUnit', sort: 'custom', - formatter: dateFormatter2, - search: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD', - type: 'daterange', - disabled: true, - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + table: { + width: 150, }, form: { - component: 'DatePicker', componentProps: { - style: {width: '100%'}, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', + enterSearch: true, disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItemPackagingPageByItemCode, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择物料代码', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] } - }, - table: { - width: 180, - }, + } }, { - label: '计量单位', - field: 'uom', + label: '包装数量', + field: 'packQty', sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'Select' - }, table: { width: 150, }, + form: { + componentProps:{ + disabled: true + } + }, + tableForm: { + disabled: true + } }, { label: '数量', @@ -393,80 +367,46 @@ export const PackageInventory = useCrudSchemas(reactive([ }, }, { - label: '替代计量单位', - field: 'altUom', + label: '受入号', + field: 'receivedNumber', sort: 'custom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - form: { - component: 'Select' - }, + isSearch: false, table: { - width: 150, - }, - }, - { - label: '替代数量', - field: 'altQty', - sort: 'custom', - table: { - width: 150, + width: 150 }, form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - }, - value: 0 + componentProps:{ + disabled: true + } }, }, { - label: '转换率', - field: 'convertRate', + label: '生产线区分', + field: 'productionLine', sort: 'custom', + isSearch: false, table: { - width: 150, + width: 150 }, }, { - label: '包装数量', - field: 'packQty', + label: '物料状态', + field: 'status', sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', table: { - width: 150, + width: 120 }, form: { componentProps:{ disabled: true } }, - tableForm: { - disabled: true - } }, { - label: '包装规格', - field: 'packUnit', - sort: 'custom', - // dictType: DICT_TYPE.PACK_UNIT, - // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - table: { - width: 150, - }, - form: { - component: 'Select', - componentProps:{ - disabled: true - } - }, - tableForm: { - disabled: true - } - }, - { - label: '仓库代码', - field: 'toWarehouseCode', + label: '供应商代码', + field: 'supplierCode', sort: 'custom', table: { width: 150, @@ -476,11 +416,11 @@ export const PackageInventory = useCrudSchemas(reactive([ componentProps: { enterSearch: true, isSearchList: true, - searchListPlaceholder: '请选择仓库代码', + searchListPlaceholder: '请选择供应商代码', searchField: 'code', - searchTitle: '仓库信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.getWarehousePage, + searchTitle: '供应商信息', + searchAllSchemas: Supplier.allSchemas, + searchPage: SupplierApi.getSupplierPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -498,129 +438,72 @@ export const PackageInventory = useCrudSchemas(reactive([ } }, { - label: '月台代码', - field: 'toDockCode', + label: '供应商名称', + field: 'supplierName', sort: 'custom', table: { width: 150, }, form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择仓库代码', - searchField: 'code', - searchTitle: '仓库信息', - searchAllSchemas: Dock.allSchemas, - searchPage: DockApi.getDockPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + componentProps:{ + disabled: true } - } + }, }, { - label: '库位代码', - field: 'toLocationCode', + label: '送货日期', + field: 'deliveryDate', sort: 'custom', - table: { - width: 150, - }, - form: { - // labelMessage: '信息提示说明！！！', + formatter: dateFormatter2, + search: { + component: 'DatePicker', componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + style: {width:'100%'}, + valueFormat: 'YYYY-MM-DD', + type: 'daterange', + disabled: false, + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - } - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - table: { - width: 150, }, form: { - // labelMessage: '信息提示说明！！！', + component: 'DatePicker', componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择供应商代码', - searchField: 'code', - searchTitle: '供应商信息', - searchAllSchemas: Supplier.allSchemas, - searchPage: SupplierApi.getSupplierPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + disabled: false } - } + }, + table: { + width: 180, + }, }, { - label: '供应商物料代码', - field: 'supplierItemCode', + label: '便次', + field: 'stoolTime', sort: 'custom', table: { width: 150, }, }, { - label: '采购订单号', - field: 'poNumber', + label: 'ASN单号', + field: 'asnNumber', sort: 'custom', table: { - width: 150, + width: 182, }, form: { // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, isSearchList: true, - searchListPlaceholder: '请选择采购订单号', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseMain.allSchemas, - searchPage: PurchaseMainApi.getPurchaseMainPage, + searchListPlaceholder: '请选择发货单号', + searchField: 'asnNumber', + searchTitle: '发货信息', + searchAllSchemas: SupplierdeliverRecordMain.allSchemas, + searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage, searchCondition: [ { key: 'supplierCode', @@ -629,64 +512,38 @@ export const PackageInventory = useCrudSchemas(reactive([ isMainValue: true }, { - key: 'available', - value: 'TRUE', - isMainValue: false + key: 'available', + value: 'TRUE', + isMainValue: false }], - verificationParams: [{ - key: 'number', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + verificationParams: [{ + key: 'asnNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, { - label: '采购订单行', - field: 'poLine', + label: '采购订单备注', + field: 'purchaseOrderRemarks', sort: 'custom', + isSearch: true, table: { width: 150, }, form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择采购订单行', - searchField: 'lineNumber', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPage, - searchCondition: [ - { - key: 'number', - value: 'poNumber', - message: '请填写采购订单号！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'lineNumber', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + componentProps:{ + disabled: true } - } + }, }, { - label: '采购计划单号', - field: 'rpNumber', + label: '月台', + field: 'toDockCode', sort: 'custom', table: { width: 150, @@ -696,25 +553,18 @@ export const PackageInventory = useCrudSchemas(reactive([ componentProps: { enterSearch: true, isSearchList: true, - searchListPlaceholder: '请选择采购订单号', - searchField: 'number', - searchTitle: '采购订单信息', - searchAllSchemas: PurchasePlanMain.allSchemas, - searchPage: PurchasePlanMainApi.getPurchasePlanMainPage, - searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - }, - { + searchListPlaceholder: '请选择仓库代码', + searchField: 'code', + searchTitle: '月台', + searchAllSchemas: Dock.allSchemas, + searchPage: DockApi.getDockPage, + searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false - }], + }], verificationParams: [{ - key: 'number', + key: 'code', action: '==', value: '', isMainValue: false, @@ -725,55 +575,33 @@ export const PackageInventory = useCrudSchemas(reactive([ } }, { - label: '发货单号', - field: 'asnNumber', + label: '受入地', + field: 'receivedLocation', sort: 'custom', + isSearch: true, table: { - width: 182, + width: 150 }, form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择发货单号', - searchField: 'asnNumber', - searchTitle: '发货信息', - searchAllSchemas: SupplierdeliverRecordMain.allSchemas, - searchPage: SupplierdeliverRecordMainApi.getSupplierdeliverRecordMainPage, - searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - }], - verificationParams: [{ - key: 'asnNumber', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + componentProps:{ + disabled: true } - } + }, }, - { - label: '操作', - field: 'action', - isForm: false, + label: '默认收货库区', + field: 'defaultReceivingArea', + sort: 'custom', + isSearch: true, table: { - width: 150, - fixed: 'right' - } - } + width: 150 + }, + form: { + componentProps:{ + disabled: true + } + }, + }, ])) //表单校验 @@ -781,49 +609,22 @@ export const PackageRulesInventor = reactive({ itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], - produceDate: [ - { required: true, message: '请选择生产日期', trigger: 'change' } - ], - validityDays: [ - { required: true, message: '请输入有效期(日)', trigger: 'blur' } - ], - expireDate: [ - { required: true, message: '请选择失效日期', trigger: 'change' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } - ], qty: [ { required: true, message: '请输入数量', trigger: 'blur' } ], - // toWarehouseCode: [ - // { required: true, message: '请选择仓库代码', trigger: 'change' } - // ], - // toDockCode: [ - // { required: true, message: '请选择月台代码', trigger: 'change' } - // ], - // toLocationCode: [ - // { required: true, message: '请选择库位代码', trigger: 'change' } - // ], + toDockCode: [ + { required: true, message: '请选择月台代码', trigger: 'change' } + ], supplierCode: [ { required: true, message: '请选择供应商代码', trigger: 'change' } ], - // supplierItemCode: [ - // { required: true, message: '请选择供应商物料代码', trigger: 'change' } - // ], - // poNumber: [ - // { required: true, message: '请选择采购订单号', trigger: 'change' } - // ], - // poLine: [ - // { required: true, message: '请选择采购订单行', trigger: 'change' } - // ], - // rpNumber: [ - // { required: true, message: '请选择采购计划单号', trigger: 'change' } - // ], asnNumber: [ - { required: true, message: '请选择发货单号', trigger: 'change' } + { required: true, message: '请选择ASN单号', trigger: 'change' } + ], + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } + ], + deliveryDate: [ + { required: true, message: '请选择送货日期', trigger: 'change' } ], })