diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts index 5d16c26f6..c789ca497 100644 --- a/src/api/wms/inventoryinitRecordDetail/index.ts +++ b/src/api/wms/inventoryinitRecordDetail/index.ts @@ -13,8 +13,8 @@ export interface InventoryinitRecordDetailVO { locationCode: string locationGroupCode: string areaCode: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string qty: number singlePrice: number amount: number diff --git a/src/api/wms/inventoryinitRequestDetail/index.ts b/src/api/wms/inventoryinitRequestDetail/index.ts index 70a7d1148..8962c3a06 100644 --- a/src/api/wms/inventoryinitRequestDetail/index.ts +++ b/src/api/wms/inventoryinitRequestDetail/index.ts @@ -13,8 +13,8 @@ export interface InventoryinitRequestDetailVO { locationCode: string locationGroupCode: string areaCode: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string qty: number number: string remark: string diff --git a/src/api/wms/issueJobDetail/index.ts b/src/api/wms/issueJobDetail/index.ts index 1d9974af6..ab43085f0 100644 --- a/src/api/wms/issueJobDetail/index.ts +++ b/src/api/wms/issueJobDetail/index.ts @@ -14,8 +14,8 @@ export interface IssueJobDetailVO { itemName: string itemDesc1: string itemDesc2: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierQty: number supplierUom: string projectCode: string diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts index 943c50f52..2a26e2141 100644 --- a/src/api/wms/itempackage/index.ts +++ b/src/api/wms/itempackage/index.ts @@ -3,8 +3,8 @@ import request from '@/config/axios' export interface ItempackagingVO { itemCode: string uom: string - stdPackUnit: string - stdPackQty: number + packUnit: string + packQty: number altPackUnit1: string altPackQty1: number altPackUnit2: string diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 9de36a25a..d43f45766 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -16,8 +16,8 @@ export interface PackageVO { altUom: string altQty: number convertRate: number - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string toWarehouseCode: string toDockCode: string toLocationCode: string diff --git a/src/api/wms/productdismantleJobDetail/index.ts b/src/api/wms/productdismantleJobDetail/index.ts index 8f9289f2d..bdd27c66f 100644 --- a/src/api/wms/productdismantleJobDetail/index.ts +++ b/src/api/wms/productdismantleJobDetail/index.ts @@ -10,8 +10,8 @@ export interface ProductdismantleJobDetailVO { produceDate: Date expireDate: Date inventoryStatus: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string itemCode: string itemName: string itemDesc1: string diff --git a/src/api/wms/productdismantleRequestDetaila/index.ts b/src/api/wms/productdismantleRequestDetaila/index.ts index 6e079cdb5..edb9652c8 100644 --- a/src/api/wms/productdismantleRequestDetaila/index.ts +++ b/src/api/wms/productdismantleRequestDetaila/index.ts @@ -10,8 +10,8 @@ export interface ProductdismantleRequestDetailaVO { produceDate: Date expireDate: Date inventoryStatus: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string number: string itemCode: string remark: string diff --git a/src/api/wms/productreceiptJobDetail/index.ts b/src/api/wms/productreceiptJobDetail/index.ts index 5b864f758..df00da6fa 100644 --- a/src/api/wms/productreceiptJobDetail/index.ts +++ b/src/api/wms/productreceiptJobDetail/index.ts @@ -13,8 +13,8 @@ export interface ProductreceiptJobDetailVO { toLocationCode: string woNumber: string woLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string itemCode: string itemName: string itemDesc1: string diff --git a/src/api/wms/productreceiptRecordDetail/index.ts b/src/api/wms/productreceiptRecordDetail/index.ts index 766ae089f..8dafd938a 100644 --- a/src/api/wms/productreceiptRecordDetail/index.ts +++ b/src/api/wms/productreceiptRecordDetail/index.ts @@ -16,8 +16,8 @@ export interface ProductreceiptRecordDetailVO { toOwnerCode: string woNumber: string woLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string number: string itemCode: string remark: string diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts index 6f11ce799..f832fb50d 100644 --- a/src/api/wms/productreceiptRequestDetail/index.ts +++ b/src/api/wms/productreceiptRequestDetail/index.ts @@ -12,8 +12,8 @@ export interface ProductreceiptRequestDetailVO { inventoryStatus: string woNumber: string woLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string number: string itemCode: string remark: string diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts index 23e754226..f85c46731 100644 --- a/src/api/wms/purchaseDetail/index.ts +++ b/src/api/wms/purchaseDetail/index.ts @@ -4,8 +4,8 @@ export interface PurchaseDetailVO { lineNumber: string erpLocationCode: string projectCode: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierQty: number supplierUom: string convertRate: number diff --git a/src/api/wms/purchasereceiptJobDetail/index.ts b/src/api/wms/purchasereceiptJobDetail/index.ts index 6201fbe0c..17ea24a60 100644 --- a/src/api/wms/purchasereceiptJobDetail/index.ts +++ b/src/api/wms/purchasereceiptJobDetail/index.ts @@ -13,8 +13,8 @@ export interface PurchasereceiptJobDetailVO { toLocationCode: string poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierQty: number supplierUom: string convertRate: number diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 569de2b18..482b2ce57 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -19,8 +19,8 @@ export interface PurchasereceiptRecordDetailVO { toAreaCodes: string poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string qty: number uom: string supplierQty: number diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index 20f40f658..0a59972a8 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -12,8 +12,8 @@ export interface PurchasereceiptRequestDetailVO { fromLocationCode: string poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierPackQty: number supplierPackUnit: string convertRate: number diff --git a/src/api/wms/saleDetail/index.ts b/src/api/wms/saleDetail/index.ts index a197299b1..79c182062 100644 --- a/src/api/wms/saleDetail/index.ts +++ b/src/api/wms/saleDetail/index.ts @@ -3,8 +3,8 @@ import request from '@/config/axios' export interface SaleDetailVO { lineNumber: string projectCode: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string customerPackQty: number customerPackUnit: string convertRate: number diff --git a/src/api/wms/supplierdeliverRecordDetail/index.ts b/src/api/wms/supplierdeliverRecordDetail/index.ts index d346cbbd9..ec852973c 100644 --- a/src/api/wms/supplierdeliverRecordDetail/index.ts +++ b/src/api/wms/supplierdeliverRecordDetail/index.ts @@ -12,8 +12,8 @@ export interface SupplierdeliverRecordDetailVO { expireDate: Date poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierQty: number supplierUom: string convertRate: number diff --git a/src/api/wms/supplierdeliverRequestDetail/index.ts b/src/api/wms/supplierdeliverRequestDetail/index.ts index e029b8883..214db6c78 100644 --- a/src/api/wms/supplierdeliverRequestDetail/index.ts +++ b/src/api/wms/supplierdeliverRequestDetail/index.ts @@ -10,8 +10,8 @@ export interface SupplierdeliverRequestDetailVO { expireDate: Date poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierPackQty: number supplierPackUnit: string convertRate: number diff --git a/src/api/wms/supplierinvoiceRecordDeatil/index.ts b/src/api/wms/supplierinvoiceRecordDeatil/index.ts index f797d2f44..5c55d7a40 100644 --- a/src/api/wms/supplierinvoiceRecordDeatil/index.ts +++ b/src/api/wms/supplierinvoiceRecordDeatil/index.ts @@ -8,8 +8,8 @@ export interface SupplierinvoiceRecordDeatilVO { altBatch: string poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierQty: number supplierUom: string convertRate: number diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 8633e63b6..d256011f2 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -9,8 +9,8 @@ export interface SupplierinvoiceRequestDetailVO { altBatch: string poNumber: string poLine: string - stdPackQty: number - stdPackUnit: string + packQty: number + packUnit: string supplierPackQty: number supplierPackUnit: string convertRate: number diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts index 91475875f..69ab06215 100644 --- a/src/utils/disposition/formFields.ts +++ b/src/utils/disposition/formFields.ts @@ -1745,7 +1745,7 @@ export const OuterPillarDeliverNote = [ { label: "版本", prop: 'version' }, { label: "工程变更通知单", prop: 'eco' }, { label: "标包计量单位", prop: 'stdPackUm' }, - { label: "标包数量", prop: 'stdPackQty' }, + { label: "包装数量", prop: 'packQty' }, { label: "替代计量单位", prop: 'extPackUm' }, { label: "替代包装数量", prop: 'extPackQty' }, { label: "备注", prop: 'remark' }, @@ -1940,7 +1940,7 @@ export const labelInfo = [ { label: "批次", prop: "lot" }, { label: "数量", prop: "qty", showProp: 'qty', type:'object' }, { label: "单位", prop: "qty", showProp: 'uom', type:'object' }, - { label: "标包数量", prop: "planQty", showProp: 'qty', type:'object' }, + { label: "包装数量", prop: "planQty", showProp: 'qty', type:'object' }, { label: "完整条码文本", prop: "fullBarcodeString" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "供应商名称", prop: 'supplierName' }, diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts index c3d90a00e..7db984905 100644 --- a/src/utils/disposition/tableDetailsColumns.ts +++ b/src/utils/disposition/tableDetailsColumns.ts @@ -10,8 +10,8 @@ { label: "订单行", prop: "poLine", }, { type:"object", label: "数量", prop: "qty", showProp:"qty", }, { type:"object", label: "单位", prop: "qty", showProp:"uom", }, - { type:"object", label: "标包数量", prop: "stdPack", showProp:"packQty", }, - { type:"object", label: "标包单位", prop: "stdPack", showProp:"packUom", }, + { type:"object", label: "包装数量", prop: "stdPack", showProp:"packQty", }, + { type:"object", label: "包装规格", prop: "stdPack", showProp:"packUom", }, { label: "转换率", prop: 'convertRate', }, { type: "filter", label: "是否寄存订单", prop: "isConsignment", filters: "whetherOrNot" }, { label: "备注", prop: 'remark', }, @@ -47,7 +47,7 @@ { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", width: "200px" }, { label: "E-LEVEL等级", prop: "itemEqLevel", width: "200px" }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", width: "200px" }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", width: "200px" }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", width: "200px" }, { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", width: "200px" }, ] /** @@ -67,7 +67,7 @@ { label: "批次", prop: "lot", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "object", label: "生产日期", prop: "batch", showProp: "produceDate", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "标包计量单位", prop: "stdPack", showProp: "packUom", }, ] /** @@ -77,7 +77,7 @@ { label: "itemCode", prop: "itemCode",fixed:"left", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", valueType: Number, label: "到货数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "每托数量", prop: "qtyPerPallet", }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom", }, { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, @@ -99,7 +99,7 @@ { type: "object", label: "物料名称", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "订单号", prop: "poNumber", }, { label: "订单行", prop: "poLine", }, { label: "箱标签", prop: "packingCode", }, @@ -108,7 +108,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { label: "E-LEVEL等级", prop: "labelEqLevel" }, { label: "备注", prop: 'remark', }, ] @@ -120,12 +120,12 @@ { type: "object", label: "物料名称", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { label: "备注", prop: 'remark', }, ] /** @@ -142,9 +142,9 @@ { type: "object", label: "退货数量", prop: "qty", showProp: "qty", }, { label: "批次", prop: "lot" }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, // { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, // { label: "备注", prop: 'remark', }, ] /** @@ -154,7 +154,7 @@ { label: "itemCode", prop: "itemCode", fixed: "left", }, { label: "箱标签", prop: "toPackingCode", }, { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "备料单位", prop: "qty", showProp: "uom", }, { label: "目标库位", prop: "toLocationCode", }, @@ -172,7 +172,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, { type: "object", valueType: Number, label: "要料数量", prop: "qty", showProp: "qty", }, { type: "object", label: "要料单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "计量单位", prop: "stdPack", showProp: "packQty", }, { label: "请求库位", prop: "requestLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, @@ -189,7 +189,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "发料单位", prop: "qty", showProp: "uom", }, { label: "请求库位", prop: "fromRequestLocationCode", }, @@ -212,7 +212,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "入库单位", prop: "qty", showProp: "uom", }, { label: "库位编号", prop: "locationCode", }, @@ -233,7 +233,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "出库单位", prop: "qty", showProp: "uom", }, { label: "库位编号", prop: "locationCode", }, @@ -254,7 +254,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, @@ -276,7 +276,7 @@ { label: "itemCode", prop: "itemCode",fixed: "left", }, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "报废单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, @@ -299,9 +299,9 @@ { type: "object", label: "物料名称", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { label: "项目", prop: "project", }, @@ -315,7 +315,7 @@ export const DeliverRequest = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { label: "目标库位", prop: "toLocationCode", }, { type: "dateTime", label: "过期时间", prop: "expiredTime", }, @@ -330,7 +330,7 @@ { label: "itemCode", prop: "itemCode", fixed: "left",}, // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "物料名称", prop: "item", showProp: "name", }, { type: "object", label: "发货单位", prop: "qty", showProp: "uom", }, { label: "目标库位", prop: "toLocationCode", }, @@ -491,8 +491,8 @@ { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "备料数量", prop: "qty", showProp: "qty", }, { type: "object", label: "备料单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "qty", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "uom", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "uom", }, { label: "目标库位", prop: "toLocationCode", }, { label: "工作中心", prop: "workStation", }, { type: "dateTime", label: "最晚时间", prop: "latestTime", }, @@ -509,7 +509,7 @@ { label: "库位编号", prop: "locationCode", }, { label: "原料库位", prop: "rawLocation", width: "100px" }, { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", width: "100px" }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", width: "100px" }, { type: "object", label: "完工收货单位", prop: "qty", showProp: "uom", width: "100px" }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, @@ -548,7 +548,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", }, - { type: "object", label: "标包单位", prop: "rawQty", showProp: "uom", }, + { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", }, { label: "来源库位代码", prop: "rawLocation", }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "rawContainerCode", }, @@ -568,7 +568,7 @@ { label: "库位编号", prop: "locationCode", }, { label: "原料库位编号", prop: "rawLocation", }, { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "批次", prop: "lot", }, { type: "object", label: "成品回收单位", prop: "qty", showProp: "uom", }, { label: "箱标签", prop: "packingCode", }, @@ -588,7 +588,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "退库单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, @@ -611,7 +611,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", }, - { type: "object", valueType: Number, label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "退货单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, @@ -632,7 +632,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "目标库位", prop: "toLocationCode", }, { label: "来源库位", prop: "fromLocationCode", }, { label: "目标仓库", prop: "toWarehouseCode", }, @@ -680,8 +680,8 @@ { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", }, { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",}, { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",}, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",}, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",}, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",}, { label: "订单号", prop: "poNumber",}, // { label: "订单行", prop: "poLine",}, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, @@ -703,8 +703,8 @@ { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", }, { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",}, { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",}, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",}, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",}, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",}, { label: "库位代码", prop: "locationCode",}, { label: "箱标签", prop: "packingCode",}, { label: "托标签", prop: "containerCode",}, @@ -722,7 +722,7 @@ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", }, { label: "异常类型", prop: "abnormalType", }, { label: "箱标签", prop: "packingCode",}, @@ -742,8 +742,8 @@ { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", }, { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", }, { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",}, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",}, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",}, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",}, { label: "实际库位", prop: "handledLocationCode",}, { label: "推荐库位", prop: "recommendLocationCode",}, { label: "实际箱标签", prop: "handledPackingCode", }, @@ -1073,7 +1073,7 @@ export const ReceivingRecords = [ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "箱标签", prop: "packingCode"}, { label: "托标签", prop: "containerCode"}, { label: "仓库", prop: "warehouseCode"}, @@ -1094,7 +1094,7 @@ export const ReceivingRecords = [ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, - // { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "产品号", prop: "productNo" }, { label: "项目号", prop: "projectCode" }, { label: "原因", prop: "reason" }, @@ -1266,7 +1266,7 @@ export const SingleDoorPanelDeliverNote = [ { label: "来源托标签", prop: "toContainerCode" }, { type: "object", label: "发货数量", prop: "qty", showProp: "qty" }, { type: "object", label: "发货单位", prop: "qty", showProp: "uom" }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" }, { label: "目标库位", prop: "toLocationCode" }, { label: "来源库位", prop: "fromLocationCode" }, { label: "目标仓库", prop: "toWarehouseCode" }, @@ -1298,8 +1298,8 @@ export const SingleDoorPanelProductReceiptNote = [ { label: "托标签", prop: "containerCode" }, { type: "object", label: "完工收货数量", prop: "qty", showProp: "qty" }, { type: "object", label: "完工单位", prop: "qty", showProp: "uom" }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom" }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch" }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate" }, { label: "库位", prop: "locationCode" }, @@ -1325,8 +1325,8 @@ export const SingleDoorPanelProductAdjust = [ { label: "仓库代码", prop: 'warehouseCode',}, { label: "数量", prop: 'qty', showProp: 'qty', type: 'object'}, { label: "单位", prop: 'qty', showProp: 'uom', type: 'object'}, - { label: "标包数量", prop: 'stdPack', showProp: 'packQty', type: 'object'}, - { label: "标包单位", prop: 'stdPack', showProp: 'packUom', type: 'object'}, + { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object'}, + { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object'}, { label: "库位代码", prop: 'locationCode',}, ] @@ -1343,8 +1343,8 @@ export const SingleDoorPanelProductAdjust = [ { label: "托标签", prop: "containerCode" }, { type: "object", label: "数量", prop: "qty", showProp: "qty" }, { type: "object", label: "单位", prop: "qty", showProp: "uom" }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty" }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom" }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty" }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom" }, { label: "目标仓库", prop: "toWarehouseCode" }, { label: "来源仓库", prop: "fromWarehouseCode" }, { label: "产品号", prop: "productNo" }, @@ -1365,8 +1365,8 @@ export const SingleDoorPanelCustomerReturnNote = [ { label: "仓库代码", prop: 'warehouseCode' }, { label: "数量", prop: 'qty', showProp: 'qty', type: 'object' }, { label: "单位", prop: 'qty', showProp: 'uom', type: 'object' }, - { label: "标包数量", prop: 'stdPack', showProp: 'packQty', type: 'object' }, - { label: "标包单位", prop: 'stdPack', showProp: 'packUom', type: 'object' }, + { label: "包装数量", prop: 'stdPack', showProp: 'packQty', type: 'object' }, + { label: "包装规格", prop: 'stdPack', showProp: 'packUom', type: 'object' }, { label: "库位代码", prop: 'locationCode' }, // { label: "生产线", prop: 'prodLine' }, // { label: "Bom版本", prop: "bomVersion" }, @@ -1384,7 +1384,7 @@ export const SingleDoorPanelCustomerReturnNote = [ { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "目标批次", prop: "toLot", }, { label: "来源批次", prop: "fromLot", }, { label: "目标库位", prop: "toLocationCode", }, diff --git a/src/utils/disposition/tableSummaryColumns.ts b/src/utils/disposition/tableSummaryColumns.ts index 580b2f7e0..98d55dc91 100644 --- a/src/utils/disposition/tableSummaryColumns.ts +++ b/src/utils/disposition/tableSummaryColumns.ts @@ -72,8 +72,8 @@ { type: "object", label: "收货数量", prop: "receiveQty", showProp: "qty", }, { type: "object", label: "收货单位", prop: "receiveQty", showProp: "uom",}, { type: "filter", filters: "taskType", label: "检验类型", prop: "inspectType",}, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty",}, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom",}, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom",}, { label: "批次", prop: "lot", }, ] @@ -87,14 +87,14 @@ { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, { label: "总数", prop: "summary" }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, - { type: "object", label: "标包数量", prop: "stdPack", showProp: "packQty", }, + { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "订单号", prop: "poNumber", }, { label: "订单行", prop: "poLine", }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "标包单位", prop: "stdPack", showProp: "packUom", }, + { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { label: "E-LEVEL等级", prop: "labelEqLevel" }, { label: "备注", prop: 'remark', }, ] \ No newline at end of file diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackaging.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackaging.data.ts index fb9cfdf8a..2af570304 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackaging.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackaging.data.ts @@ -51,7 +51,7 @@ export const Itempackaging = useCrudSchemas(reactive([ }, { label: '包装单位', - field: 'stdPackUnit', + field: 'packUnit', sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', @@ -63,7 +63,7 @@ export const Itempackaging = useCrudSchemas(reactive([ }, { label: '包装数量', - field: 'stdPackQty', + field: 'packQty', sort: 'custom', isSearch: true, table: { @@ -276,7 +276,7 @@ export const Itempackaging = useCrudSchemas(reactive([ export const ItempackagingRules = reactive({ itemCode: [{ required: true, message: '物料代码不能为空', trigger: 'change' }], uom: [{ required: true, message: '计量单位不能为空', trigger: 'change' }], - stdPackUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }], - stdPackQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }], + packUnit: [{ required: true, message: '包装单位不能为空', trigger: 'change' }], + packQty: [{ required: true, message: '包装数量不能为空', trigger: 'change' }], available: [{ required: true, message: '是否可用不能为空', trigger: 'change' }] }) \ No newline at end of file diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 144a316f8..0e9b3eb32 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -111,8 +111,8 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row }).then(res => { if (res) { if (res.list.length > 0) { - setV['stdPackQty'] = res.list[0].stdPackQty - setV['stdPackUnit'] = res.list[0].stdPackUnit + setV['packQty'] = res.list[0].packQty + setV['packUnit'] = res.list[0].packUnit } } }) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 296e93f68..1305d6419 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -320,8 +320,8 @@ export const PackageInventory = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150, @@ -336,8 +336,8 @@ export const PackageInventory = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index db3e1cdb7..b65e361e4 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -111,8 +111,8 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row }).then(res => { if (res) { if (res.list.length > 0) { - setV['stdPackQty'] = res.list[0].stdPackQty - setV['stdPackUnit'] = res.list[0].stdPackUnit + setV['packQty'] = res.list[0].packQty + setV['packUnit'] = res.list[0].packUnit } } }) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index d5a04a2cd..7f43c5459 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -329,8 +329,8 @@ export const PackageInventory = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150, @@ -345,8 +345,8 @@ export const PackageInventory = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 8dc5953e7..9ced4a3ad 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -333,8 +333,8 @@ export const SaleDetail = useCrudSchemas(reactive([ isTableForm: false, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -353,8 +353,8 @@ export const SaleDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -716,11 +716,11 @@ export const SaleDetailRules = reactive({ { required: true, message: '请输入行号', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], convertRate: [ { required: true, message: '请输入转换率', trigger: 'blur' } diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 09049d38f..1f6f169fc 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -184,16 +184,16 @@ export const Package = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150, }, }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index 29062b593..f3aa5210a 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -355,8 +355,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -366,8 +366,8 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -614,11 +614,11 @@ export const InventoryinitRecordDetailRules = reactive({ areaCode: [ { required: true, message: '请选择库区代码', trigger: 'change' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 34c4d8138..933dd44d2 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -505,8 +505,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -527,8 +527,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index 3d61a23a2..551c2f5d8 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -229,8 +229,8 @@ const buttonTableClick = async (val, row) => { itemName: "物料01", itemDesc1: "", itemDesc2: "", - stdPackQty: null, - stdPackUnit: null, + packQty: null, + packUnit: null, supplierQty: null, supplierUom: null, projectCode: "xm01", diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index a717a5a46..588b100e2 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -705,8 +705,8 @@ export const IssueJobDetail = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -716,8 +716,8 @@ export const IssueJobDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts index e5f90da52..ec4a40e2e 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts @@ -682,8 +682,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -693,8 +693,8 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -855,11 +855,11 @@ export const ProductdismantleJobDetailRules = reactive({ inventoryStatus: [ { required: true, message: '请选择库存状态', trigger: 'change' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index a66327cb4..ad23a5e20 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -767,8 +767,8 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive { "inventoryStatus": "OK", "woNumber": null, "woLine": null, - "stdPackQty": 8, - "stdPackUnit": "BOX", + "packQty": 8, + "packUnit": "BOX", "itemCode": "item01", "itemName": "物料01", "itemDesc1": "", diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 567ccfb51..e7fcc15b7 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -714,8 +714,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -725,8 +725,8 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -877,11 +877,11 @@ export const ProductreceiptJobDetailRules = reactive({ woLine: [ { required: true, message: '请输入订单行', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], toLocationCode: [ { required: true, message: '请选择到库位代码', trigger: 'change' } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index e43a132f4..bf7a3400e 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -482,8 +482,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -493,8 +493,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -684,11 +684,11 @@ export const ProductreceiptRecordDetailRules = reactive({ woLine: [ { required: true, message: '请输入订单行', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], number: [ { required: true, message: '请输入单据号', trigger: 'blur' } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index c31cb9e42..b7e310224 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -656,8 +656,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive isForm: false }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -673,8 +673,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive isForm: false }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index dff08fb6c..09737cd71 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -759,8 +759,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -770,8 +770,8 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -963,11 +963,11 @@ export const PurchasereceiptJobDetailRules = reactive({ poLine: [ { required: true, message: '请输入订单行', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], convertRate: [ { required: true, message: '请输入转换率', trigger: 'blur' } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 90c8c9b75..6bfcb0b89 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -526,8 +526,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -537,8 +537,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isSearch: true, @@ -886,11 +886,11 @@ export const PurchasereceiptRecordDetailRules = reactive({ poLine: [ { required: true, message: '请选择订单行', trigger: 'change' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], convertRate: [ { required: true, message: '请输入转换率', trigger: 'blur' } diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 36857bb98..e48c9af27 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -751,8 +751,8 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', table: { width: 150 }, @@ -508,8 +508,8 @@ export const PurchaseDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -812,11 +812,11 @@ export const PurchaseDetailRules = reactive({ { required: true, message: '请输入行号', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'change' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } ], convertRate: [ { required: true, message: '请输入转换率', trigger: 'blur' } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts index 9f76f9337..3e4e66ed9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts @@ -196,16 +196,16 @@ export const Package = useCrudSchemas(reactive([ }, }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150, }, }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', // 默认都是字符串类型其他暂不考虑 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 8bf224f5f..5b3aa2a3d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -483,8 +483,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, { - label: '标包数量', - field: 'stdPackQty', + label: '包装数量', + field: 'packQty', sort: 'custom', table: { width: 150 @@ -494,8 +494,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive } }, { - label: '标包单位', - field: 'stdPackUnit', + label: '包装规格', + field: 'packUnit', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', isTable: true, @@ -779,11 +779,11 @@ export const SupplierdeliverRecordDetailRules = reactive({ poLine: [ { required: true, message: '请输入订单行', trigger: 'blur' } ], - stdPackQty: [ - { required: true, message: '请输入标包数量', trigger: 'blur' } + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } ], - stdPackUnit: [ - { required: true, message: '请选择标包单位', trigger: 'blur' } + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'blur' } ], toLocationCode: [ { required: true, message: '请输入到库位代码', trigger: 'blur' } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8186d8ac3..c40a8abac 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -568,8 +568,8 @@ const print = async () => { // altUom: '', // altQty: '', // convertRate: '', - // stdPackQty: '', - // stdPackUnit: '', + // packQty: '', + // packUnit: '', // toWarehouseCode: '', // toDockCode: '', // toLocationCode: '', @@ -595,8 +595,8 @@ const print = async () => { // packageObject.expireDate=item.expireDate // packageObject.uom=item.uom // packageObject.qty=item.qty - // packageObject.stdPackQty=item.stdPackQty - // packageObject.stdPackUnit=item.stdPackUnit + // packageObject.packQty=item.packQty + // packageObject.packUnit=item.packUnit // packageObject.convertRate=item.convertRate // packageObject.poNumber=item.poNumber // packageObject.poLine=item.poLine diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 8a8097903..d76c6b37f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -714,8 +714,8 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive