diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index a4bf6c55a..4dc7ef91d 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -15,11 +15,11 @@ export const Dict = [ /**/ // 供应商发货通知 已调整 export const SupplierAsn = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发货数量", prop: "qty" }, - { label: "物料单位", prop: "uom" }, + { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "ERP库位", prop: "recommendErpCode" }, @@ -44,11 +44,11 @@ export const SupplierAsn = [ // 采购订单信息 已调整 export const PurchaseOrder = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发货数量", prop: "qty" }, - { label: "物料单位", prop: "uom" }, + { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, { label: "ERP库位", prop: "locationErpCode" }, { label: "项目编号", prop: "projectCode" }, @@ -69,11 +69,11 @@ export const PurchaseOrder = [ ] // 到货通知 已调整 export const ArriveNotice = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发货数量", prop: "qty" }, - { label: "物料单位", prop: "uom" }, + { label: "物品单位", prop: "uom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "ERP库位", prop: "recommendErpCode" }, @@ -100,12 +100,12 @@ export const ArriveNotice = [ ] // 采购收货任务 已调整 export const PurchaseReceiptJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, { label: "数量", prop: "recommendQty" }, - { label: "物料单位", prop: "recommendUom" }, + { label: "物品单位", prop: "recommendUom" }, { label: "生产批次", prop: 'recommendLot' }, { label: "箱码", prop: "recommendPackingCode" }, { label: "ERP库位", prop: "recommendErpCode" }, @@ -153,11 +153,11 @@ export const PurchaseReceiptJob = [ ] // 报检单 已调整 export const InspectNotice = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName", width: orderWidth }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName", width: orderWidth }, + { label: "物品描述", prop: "itemDesc1" }, { label: "收货数量", prop: "receiveQty" }, - { label: "物料单位", prop: "receiveUom" }, + { label: "物品单位", prop: "receiveUom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" }, @@ -202,12 +202,12 @@ export const InspectNotice = [ // 检验记录 字段需要确定 export const InspectNote = [ // { label: "其他详情", fixed: "left", type: "button" }, - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述1", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "收货数量", prop: "receiveQty" }, - { label: "物料单位", prop: "receiveUom" }, + { label: "物品单位", prop: "receiveUom" }, { label: "生产批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "库位", prop: 'locationCode' }, @@ -258,9 +258,9 @@ export const InspectNote = [ // 不合格转合格记录 已调整 export const unqualifiedToQualifiedNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -297,9 +297,9 @@ export const unqualifiedToQualifiedNote = [ ] // 采购上架记录 已调整 export const PutawayNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "到货数", prop: 'shippedQty' }, { label: "单位", prop: "uom" }, @@ -347,9 +347,9 @@ export const PutawayNote = [ ] // 人工叫料申请 待确认 export const IssueRequest = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, @@ -379,9 +379,9 @@ export const IssueRequest = [ ] // 人工发料任务 已调整 export const IssueJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" }, { label: "单位", prop: "recommendUom" }, { label: "推荐批次", prop: "recommendLot" }, @@ -438,9 +438,9 @@ export const IssueJob = [ ] // 人工发料记录 已调整 export const IssueNote = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -483,9 +483,9 @@ export const IssueNote = [ ] // 自动叫料申请 待确认 export const automaticCallApply = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "叫料数量", prop: "qty" }, { label: "单位", prop: "uom" }, // 批次占位 @@ -515,9 +515,9 @@ export const automaticCallApply = [ ] // 自动发料任务 已调整 export const automaticCallJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "单位", prop: "recommendUom" }, { label: "推荐批次", prop: "recommendLot" }, { label: "实际批次", prop: "handledLot" }, @@ -574,9 +574,9 @@ export const automaticCallJob = [ ] // 自动发料记录 已调整 export const automaticCallNote = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -619,9 +619,9 @@ export const automaticCallNote = [ ] // 上架前退货记录 已调整 export const beforeGroundingReturnNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -649,9 +649,9 @@ export const beforeGroundingReturnNote = [ ] // 上架后退货申请 已调整 export const PurchaseReturnRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -679,9 +679,9 @@ export const PurchaseReturnRequest = [ ] // 上架后退货任务 已调整 export const PurchaseReturnJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, // 上架后退货任务先都用【recommend】信息,已跟后端确定 { label: "数量", prop: "recommendQty" }, { label: "单位", prop: "recommendUom" }, @@ -729,9 +729,9 @@ export const PurchaseReturnJob = [ ] // 上架后退货记录 已调整 export const PurchaseReturnNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -761,9 +761,9 @@ export const PurchaseReturnNote = [ ] // 原料报废记录 已调整 export const ScrapNote = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "报废数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'toLot' }, @@ -804,9 +804,9 @@ export const ScrapNote = [ ] // 原料直发客户记录 已调整 export const materialDirectSendNote = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -848,9 +848,9 @@ export const materialDirectSendNote = [ ] // 直接发料记录 export const directIssueNote = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "发料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -895,9 +895,9 @@ export const directIssueNote = [ /**/ // 完工收货缴库申请 export const ProductReceiptRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -919,9 +919,9 @@ export const ProductReceiptRequest = [ ] // 完工收货缴库记录 已调整 export const ProductReceiptNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -950,9 +950,9 @@ export const ProductReceiptNote = [ ] // 完工收货报废申请 export const ProductReceiptScrapRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"areaCode" }, @@ -969,9 +969,9 @@ export const ProductReceiptScrapRequest = [ ] // 完工收货报废记录 已调整 export const ProductReceiptScrapNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "报废数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "报废库区", prop:"fromLocationArea" }, @@ -1011,9 +1011,9 @@ export const ProductReceiptScrapNote = [ ] // 半成品上架记录 已调整 export const partiallyPreparedProductsNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -1060,9 +1060,9 @@ export const partiallyPreparedProductsNote = [ ] // 成品发货申请 已调整 export const DeliverRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "发货库区", prop: "areaCode" }, @@ -1077,9 +1077,9 @@ export const DeliverRequest = [ ] // 成品发货任务 已调整 export const DeliverJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "出货数量", prop: "recommendQty" }, { label: "单位", prop: "recommendUom" }, { label: "出货库区", prop: "recommendLocationArea" }, @@ -1121,9 +1121,9 @@ export const DeliverJob = [ ] // 成品发货记录 已调整 export const DeliverNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'fromLot' }, @@ -1164,9 +1164,9 @@ export const DeliverNote = [ ] // FIS发货申请 已调整 export const FISDeliverRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' }, @@ -1183,9 +1183,9 @@ export const FISDeliverRequest = [ ] // FIS发货记录 已调整 export const FISDeliverNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "出货数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' }, @@ -1225,9 +1225,9 @@ export const FISDeliverNote = [ ] // 客户退拆申请 已调整 export const customerDismantle = [ - { label: "退拆物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "退拆物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "预定开工日", prop: "preStartTime",type: "dateTime" }, { label: "退拆数量", prop: "qty" }, { label: "单位", prop: 'uom' }, @@ -1253,9 +1253,9 @@ export const customerDismantle = [ ] // 生产退库申请 已调整 export const productionReturnRequest = [ - { label: "物料代码", prop: "itemCode",fixed:"left" }, - { label: "物料名称", prop: 'itemName' }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed:"left" }, + { label: "物品名称", prop: 'itemName' }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: 'qty' }, { label: "单位", prop: 'uom' }, { label: "批次", prop: 'lot' }, @@ -1284,9 +1284,9 @@ export const productionReturnRequest = [ ] // 生产退库任务 已调整 export const productionReturnJob = [ - { label: "物料代码", prop: "itemCode",fixed:"left" }, - { label: "物料名称", prop: 'itemName' }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed:"left" }, + { label: "物品名称", prop: 'itemName' }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: 'recommendQty' }, { label: "单位", prop: 'recommendUom' }, { label: "批次", prop: 'recommendLot' }, @@ -1331,9 +1331,9 @@ export const productionReturnJob = [ ] // 生产退库记录 已调整 export const productionReturnNote = [ - { label: "物料代码", prop: "itemCode",fixed:"left" }, - { label: "物料名称", prop: 'itemName' }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed:"left" }, + { label: "物品名称", prop: 'itemName' }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: 'qty' }, { label: "单位", prop: 'uom' }, { label: "批次", prop: 'toLot' }, @@ -1376,9 +1376,9 @@ export const productionReturnNote = [ /**/ // 非生产领料申请 已调整 export const pickingRequest = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1410,9 +1410,9 @@ export const pickingRequest = [ ] // 非生产领料审批 已调整 export const pickingApproval = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1444,9 +1444,9 @@ export const pickingApproval = [ ] // 非生产领料记录 已调整 export const pickingNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "领料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1479,9 +1479,9 @@ export const pickingNote = [ ] // 非生产退料申请 已调整 export const materialReturnRequest = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1513,9 +1513,9 @@ export const pickingNote = [ ] // 非生产退料审批 已调整 export const materialReturnApproval = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1547,9 +1547,9 @@ export const materialReturnApproval = [ ] // 非生产退料记录 已调整 export const materialReturnNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "退料数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1582,10 +1582,10 @@ export const materialReturnNote = [ ] // 回收料收货记录 已调整 export const recycledMaterialsReceipt = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述1", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1612,8 +1612,8 @@ export const recycledMaterialsReceipt = [ export const recycledMaterialsAdjustmentApply = [ { label: "来源物品代码", prop: "itemCode" }, { label: "目标物品代码", prop: "toItemCode" }, - { label: "物料描述1", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "来源箱标签", prop: "fromPackingCode" }, { label: "目标箱标签", prop: "toPackingCode" }, { label: "调整数量", prop: "fromQty" }, @@ -1648,8 +1648,8 @@ export const recycledMaterialsAdjustmentApply = [ export const materialsAdjustment = [ { label: "来源物品代码", prop: "itemCode" }, { label: "目标物品代码", prop: "toItemCode" }, - { label: "物料描述1", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "来源箱标签", prop: "fromPackingCode" }, { label: "目标箱标签", prop: "toPackingCode" }, { label: "调整数量", prop: "toQty" }, @@ -1681,9 +1681,9 @@ export const materialsAdjustment = [ ] // 线边仓调拨申请 已调整 export const lineSideWarehouseAllocationRequest = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -1721,9 +1721,9 @@ export const lineSideWarehouseAllocationRequest = [ ] // 线边仓调拨确认 已调整 export const lineSideWarehouseAllocationConfirm = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -1761,9 +1761,9 @@ export const lineSideWarehouseAllocationConfirm = [ ] // 线边仓调拨记录 已调整 export const lineSideWarehouseAllocationNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -1802,9 +1802,9 @@ export const lineSideWarehouseAllocationNote = [ ] // 储位调拨记录 已调整 export const interStorageAllocationNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: 'toLot' }, @@ -1842,9 +1842,9 @@ export const interStorageAllocationNote = [ ] // 客户储位调拨申请 已调整 export const customerStorageAllocationRequest = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -1887,9 +1887,9 @@ export const customerStorageAllocationRequest = [ ] // 客户储位调拨确认 已调整 export const customerStorageAllocationConfirm = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "fromLot" }, @@ -1932,9 +1932,9 @@ export const customerStorageAllocationConfirm = [ ] // 客户储位调拨记录 已调整 export const customerStorageAllocationNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -1953,9 +1953,9 @@ export const customerStorageAllocationNote = [ ] // 储位内移库记录 已调整 export const intraStorageTransferNote = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "调拨数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "toLot" }, @@ -1994,9 +1994,9 @@ export const intraStorageTransferNote = [ ] // 线边仓缴库申请 待确认 export const lineSideWarehousePaymentRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "返线数量", prop: "returnQty" }, @@ -2024,9 +2024,9 @@ export const lineSideWarehousePaymentRequest = [ ] // 线边仓缴库记录 已调整 export const lineSideWarehousePaymentNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "返线数量", prop: "returnQty" }, @@ -2055,9 +2055,9 @@ export const lineSideWarehousePaymentNote = [ ] // 线边仓报废申请 已调整 export const lineSideWarehouseScrappingRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"locationArea" }, @@ -2075,9 +2075,9 @@ export const lineSideWarehouseScrappingRequest = [ ] // 线边仓报废记录 已调整 export const lineSideWarehouseScrappingNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "库区", prop:"toLocationArea" }, @@ -2117,9 +2117,9 @@ export const lineSideWarehouseScrappingNote = [ ] // 线边仓调整申请 已调整 export const lineSideWarehouseAdjustmentSheetRequest = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "调整库位", prop: 'locationCode' }, @@ -2140,9 +2140,9 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ ] // 线边仓调整记录 已调整 export const lineSideWarehouseAdjustmentSheetNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "adjustQty" }, { label: "单位", prop: "inventoryUom" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, @@ -2210,9 +2210,9 @@ export const InventoryInitialNote = [ ] // 盘点计划 已调整 export const CountPlan = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "库存数量", prop: "inventoryQty" }, { label: "初盘数量", prop: "firstCountQty" }, { label: "最终盘点数量", prop: "finalCountQty" }, @@ -2230,7 +2230,7 @@ export const CountPlan = [ { label: "初盘操作员", prop: "firstCountOperator" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // ----------------------------------------------------------------------- - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" }, { label: "重盘数量", prop: "repeatCountQty" }, @@ -2262,9 +2262,9 @@ export const CountPlan = [ ] // 盘点任务 已调整 export const CountJob = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "库存数量", prop: "inventoryQty" }, { label: "盘点数量", prop: "countQty" }, { label: "库存单位", prop: "inventoryUom" }, @@ -2280,7 +2280,7 @@ export const CountJob = [ { label: "盘点描述", prop: "countDescription" }, // ----------------------------------------------------------------------- { label: "单据号", prop: 'number', width:orderWidth }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "备注", prop: 'remark' }, { label: "包装数量", prop: "stdPackQty" }, { label: "包装单位", prop: "stdPackUom" }, @@ -2303,9 +2303,9 @@ export const CountJob = [ ] // 盘点记录 已调整 export const CountNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "库存数量", prop: "inventoryQty" }, { label: "初盘数量", prop: "firstCountQty" }, { label: "最终盘点数量", prop: "finalCountQty" }, @@ -2326,7 +2326,7 @@ export const CountNote = [ // ----------------------------------------------------------------------- { label: "包装数量", prop: "stdPackQty" }, { label: "包装单位", prop: "stdPackUom" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" }, { label: "阶段", prop: "stage",type: "filter", filters: "stageType" }, { label: "重盘数量", prop: "repeatCountQty" }, @@ -2358,9 +2358,9 @@ export const CountNote = [ ] // 盘点调整申请 已调整 export const CountPlanAdjust = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "盘点数量", prop: "countQty" }, { label: "调整数量", prop: "qty" }, { label: "库存数量", prop: "inventoryQty" }, @@ -2376,7 +2376,7 @@ export const CountPlanAdjust = [ { label: "原因代码", prop: "reasonCode", }, { label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, // ----------------------------------------------------------------------- - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "单位", prop: "uom" }, { label: "供应商批次", prop: "supplierBatch" }, { label: "备注", prop: 'remark' }, @@ -2398,9 +2398,9 @@ export const CountPlanAdjust = [ ] // 盘点调整记录 已调整 export const CountAdjustNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "库存数量", prop: "inventoryQty" }, { label: "盘点差异数量", prop: "diffQty" }, { label: "盘点数量", prop: "countQty" }, @@ -2419,7 +2419,7 @@ export const CountPlanAdjust = [ { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "操作员", showProp:"worker",type:"outerMainFilter" }, // ----------------------------------------------------------------------- - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "供应商批次", prop: "supplierBatch" }, { label: "生产日期", prop: "produceDate",type:"dateTime" }, { label: "备注", prop: 'remark' }, diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js index c8523ce10..a78fd15ac 100644 --- a/fe/PC/src/utils/summaryTableColumns/index.js +++ b/fe/PC/src/utils/summaryTableColumns/index.js @@ -6,10 +6,10 @@ const orderWidth = 180 // 报检单 已调整 export const InspectNotice = [ // { label: "检验详情", fixed: "left", type: "button" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料单位", prop: "receiveUom" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品单位", prop: "receiveUom" }, { label: "生产批次", prop: "lot" }, { label: "收货数量", prop: 'receiveQty' }, { label: "检验数量", prop: 'inspectQty' }, @@ -45,10 +45,10 @@ export const InspectNotice = [ ] // 检验记录 字段需要确定 export const InspectNote = [ - { label: "物料代码", prop: "itemCode", fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料单位", prop: 'receiveUom' }, + { label: "物品代码", prop: "itemCode", fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品单位", prop: 'receiveUom' }, { label: "生产批次", prop: "lot" }, { label: "收货数量", prop: 'receiveQty' }, { label: "检验数量", prop: 'inspectQty' }, @@ -61,7 +61,7 @@ export const InspectNote = [ // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" }, // ----------------------------------------------------------------------- { label: "单据号", prop: "number" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "创建时间", prop: "completeTime",type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建者Id", prop: 'creatorId' }, diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index fc98d76b1..5f6e0b58b 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -5,14 +5,14 @@ const orderWidth = 180 // 物品基础信息 20230328 export const ItemBasic = [ { - label: "物料代码", + label: "物品代码", prop: "code", fixed: "left", type: "name" }, - { label: "物料名称", prop: "name" }, - { label: "物料描述1", prop: "desc1" }, - { label: "物料描述2", prop: "desc2" }, + { label: "物品名称", prop: "name" }, + { label: "物品描述1", prop: "desc1" }, + { label: "物品描述2", prop: "desc2" }, { label: "状态", prop: "status", type: "filter", filters: "itemStatus" }, { label: "类型", prop: 'type', type: "filter", filters: "ItemTypeBasic" }, { label: "ABC类", prop: 'abcClass', type: "filter", filters: "abcClass" }, @@ -20,10 +20,10 @@ export const ItemBasic = [ { label: "采购件", prop: 'canBuy', type: "filter", filters: "whetherOrNot" }, { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" }, { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" }, - { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" }, + { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" }, { label: "产品类", prop: 'productLine' }, { label: "E-LEVEL等级", prop: 'elevel' }, - // { label: "物料分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" }, + // { label: "物品分类", prop: "itemCategoryDictionary", type: "object", showProp: "ItemCategory" }, { label: "颜色", prop: "color" }, // --------------------------------------- { label: "创建时间", prop: "creationTime", type: "dateTime" }, @@ -52,7 +52,7 @@ export const ItemBasic = [ // 物品质量信息 20230328 export const ItemQuality = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" @@ -76,7 +76,7 @@ export const ItemQuality = [ // 物品分类信息 20230328 export const ItemCategory = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" @@ -106,11 +106,11 @@ export const ItemPack = [ }, { label: "包装名称", prop: "packName" }, { label: '包装类型', prop: "packType" }, - { label: '物料代码', prop: "itemCode" }, + { label: '物品代码', prop: "itemCode" }, // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, // { label: '标包编号', prop: "stdPackCode" }, // { label: "包装数量", prop: "packQty" }, - // { label: "物料单位", prop: "packUom" }, + // { label: "物品单位", prop: "packUom" }, // { label: "转换率", prop: "conversionRate" }, // ----------------------------------------------------------------------- { label: '包装计量单位', prop: "basicUom" }, @@ -126,11 +126,11 @@ export const ItemPack = [ // fixed: "right" // }, ] -// 物料质检标准信息 20230328 +// 物品质检标准信息 20230328 export const AQL = [ { - //label: "物料代码", - label: "物料代码", + //label: "物品代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" @@ -154,17 +154,17 @@ export const AQL = [ // fixed: "right" // }, ] -// 物料清单信息 20230328 +// 物品清单信息 20230328 export const Bom = [ { - label: "父物料号", + label: "父物品号", prop: "product", fixed: "left", type: "name" }, - { label: "子物料号", prop: "component" }, - { label: "子物料用量", prop: 'componentQty' }, - { label: "子物料用量单位", prop: 'componentUom' }, + { label: "子物品号", prop: "component" }, + { label: "子物品用量", prop: 'componentQty' }, + { label: "子物品用量单位", prop: 'componentUom' }, { label: "ERP工序", prop: "erpOp" }, { label: "制造工序", prop: "mfgOp" }, { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" }, @@ -185,19 +185,19 @@ export const Bom = [ // fixed: "right" // }, ] -// 物料清单信息 - 详情【父物料信息、子物料信息】 20230331 +// 物品清单信息 - 详情【父物品信息、子物品信息】 20230331 export const BomInner = [ { - label: "父物料号", + label: "父物品号", prop: "product", fixed: "left", type: "name" }, - { label: "子物料号", prop: "component" }, - { label: "子物料用量", prop: 'componentQty' }, - { label: "子物料用量单位", prop: 'componentUom' }, - // { label: "子物料用量", prop: 'perQty', type:"object",showProp: 'qty' }, - // { label: "子物料用量单位", prop: 'perQty', type:"object",showProp: 'uom' }, + { label: "子物品号", prop: "component" }, + { label: "子物品用量", prop: 'componentQty' }, + { label: "子物品用量单位", prop: 'componentUom' }, + // { label: "子物品用量", prop: 'perQty', type:"object",showProp: 'qty' }, + // { label: "子物品用量单位", prop: 'perQty', type:"object",showProp: 'uom' }, { label: "ERP工序", prop: "erpOp" }, { label: "制造工序", prop: "mfgOp" }, { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" }, @@ -265,8 +265,8 @@ export const CustomerItem = [ fixed: "left", type: "name" }, - { label: "客户物料代码", prop: "customerItemCode" }, - { label: "物料代码", prop: "itemCode" }, + { label: "客户物品代码", prop: "customerItemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "包装数量", prop: "customerPackQty" }, { label: "包装单位", prop: "customerPackUom" }, { label: "开始时间", prop: "beginTime", type: "dateTime" }, @@ -382,9 +382,9 @@ export const SupplierItem = [ fixed: "left", type: "name" }, - { label: "物料代码", prop: "itemCode" }, - { label: "供应商物料代码", prop: "supplierItemCode" }, - { label: "供应商物料名称", prop: "itemName" }, + { label: "物品代码", prop: "itemCode" }, + { label: "供应商物品代码", prop: "supplierItemCode" }, + { label: "供应商物品名称", prop: "itemName" }, { label: "供应商简称", prop: "supplierSimpleName" }, { label: "版本", prop: "version" }, // ----------------------------------------------- @@ -597,7 +597,7 @@ export const Location = [ // 库位零件关系 20230331 export const ItemStoreRelation = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" @@ -655,7 +655,7 @@ export const InventoryLocationCapacity = [ // 物品安全库存信息 20230328 export const ItemSafetyStock = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" @@ -768,7 +768,7 @@ export const ProductionLine = [ ] // 生产线零件关系 20230328 export const ProductionLineItem = [ - { label: "物料代码", prop: "itemCode", type: "name" }, + { label: "物品代码", prop: "itemCode", type: "name" }, { label: "生产线编号", prop: "prodLineCode" }, { label: "备注", prop: "remark" }, // ----------------------------------------------------------------------- @@ -860,15 +860,15 @@ export const Shift = [ // 作业指导书信息 20230328 export const ItemGuideBook = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, // ----------------------------------------------------------------------- - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "备注", prop: "remark" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, @@ -1228,11 +1228,11 @@ export const qualifiedInfo = [ width: orderWidth }, { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, - { label: "物料单位", prop: "uom" }, + { label: "物品单位", prop: "uom" }, { label: "批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, { label: "ERP库位", prop: "recommendErpCode" }, @@ -1249,11 +1249,11 @@ export const unqualifiedInfo = [ width: orderWidth }, { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, - { label: "物料单位", prop: "uom" }, + { label: "物品单位", prop: "uom" }, { label: "箱码", prop: "packingCode" }, { label: "ERP库位", prop: "recommendErpCode" }, { label: "不合格原因代码", prop: 'failedReason' }, @@ -1265,9 +1265,9 @@ export const unqualifiedInfo = [ ] // 采购收货记录-详情【收货缺料明细】 export const lackMaterialsInfo = [ - { label: "物料代码", prop: "itemCode",fixed: "left" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode",fixed: "left" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "批次", prop: "lot" }, { label: "ERP库位", prop: "recommendErpCode" }, ] @@ -1344,9 +1344,9 @@ export const InspectNote = [ export const unqualifiedToQualified = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, // { label: "发货单号", prop: "asnNumber", width: orderWidth }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -2146,9 +2146,9 @@ export const customerDismantleNote = [ ] // 客户退拆记录-明细【即回冲记录】 已调整 export const customerDismantleBackFlushNote = [ - { label: "退拆物料号", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1", }, + { label: "退拆物品号", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1", }, { label: "预定开工日", prop: "preStartTime" ,type: "dateTime", }, { label: "退拆数量", prop: "qty" }, { label: "扣账库位", prop: 'locationCode' }, @@ -2352,9 +2352,9 @@ export const labelsList = [ type: "name", fixed:"left" }, - { label: "物料代码", prop: 'itemCode' }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: 'itemCode' }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -2391,15 +2391,15 @@ export const InventoryInitialNote = [ // 库存余额 export const InventoryBalance = [ { - label: "物料代码", + label: "物品代码", prop: "itemCode", fixed: "left", type: "name", width: orderWidth }, - { label: "物料名称", prop: 'itemName' }, - { label: "物料描述1", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品名称", prop: 'itemName' }, + { label: "物品描述1", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "库存数量", prop: "qty" }, { label: "计量单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -2426,9 +2426,9 @@ export const InventoryTransaction = [ type: "name", width: orderWidth }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "事务数量", prop: "qty" }, @@ -2463,9 +2463,9 @@ export const InventoryTransferLog = [ }, { label: "从状态", prop: "fromStatus",type: "filter", filters: "requestStatus" }, { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "到货数量", prop: "qty" }, { label: "到货单位", prop: "uom" }, { label: "从库位编号", prop: "fromLocationCode" }, @@ -2488,9 +2488,9 @@ export const expectOut = [ }, { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "占用数量", prop: "qty" }, { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, @@ -2512,9 +2512,9 @@ export const expectIn = [ }, { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "占用数量", prop: "qty" }, { label: "库位代码", prop: "locationCode" }, { label: "箱码", prop: "packingCode" }, @@ -2996,7 +2996,7 @@ export const CountPlan = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "事务代码", prop: "tenantId" }, - { label: "物料代码JSON", prop: 'jsonItemCodes' }, + { label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' }, { label: "仓库", prop: 'warehouseCode' }, { label: "公司", prop: 'company' }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 877c8490e..a2261fdd9 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2,10 +2,10 @@ /**/ // 物品基础信息 20230328 export const ItemBasic = [ - { label: "物料代码", prop: 'code' }, - { label: "物料名称", prop: "name" }, - { label: "物料描述1", prop: "desc1" }, - { label: "物料描述2", prop: "desc2" }, + { label: "物品代码", prop: 'code' }, + { label: "物品名称", prop: "name" }, + { label: "物品描述1", prop: "desc1" }, + { label: "物品描述2", prop: "desc2" }, { label: "状态", prop: "status", type: "filter", filters: "itemStatus" }, { label: "计量单位", prop: 'basicUom' }, { label: "ABC类", prop: 'abcClass',type: "filter", filters: "abcClass" }, @@ -26,7 +26,7 @@ export const ItemBasic = [ { label: "版本", prop: 'version' }, { label: "工程变更", prop: 'eco' }, { label: "E-LEVEL等级", prop: 'elevel' }, - { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" }, + { label: "是否虚拟物品", prop: "isPhantom", type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "标包数", prop: "stdPackQty" }, @@ -40,7 +40,7 @@ export const ItemBasic = [ ] // 物品质量信息 20230328 export const ItemQuality = [ - { label: "物料代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "供应商代码", prop: 'supplierCode' }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" }, @@ -58,7 +58,7 @@ export const ItemQuality = [ ] // 物品分类信息 20230328 export const ItemCategory = [ - { label: "物料代码", prop: 'itemCode' }, + { label: "物品代码", prop: 'itemCode' }, { label: "分类编号", prop: "categoryCode" }, { label: "分类值", prop: "value" }, { label: "备注", prop: 'remark' }, @@ -76,13 +76,13 @@ export const ItemCategory = [ export const ItemPack = [ { label: "包装代码", prop: 'packCode' }, { label: "包装名称", prop: "packName" }, - { label: '物料代码', prop: "itemCode" }, + { label: '物品代码', prop: "itemCode" }, { label: '包装计量单位', prop: "basicUom" }, { label: '包装数量', prop: "qty" }, // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" }, // { label: '标包编号', prop: "stdPackCode" }, // { label: "包装数量", prop: "packQty" }, - // { label: "物料单位", prop: "packUom" }, + // { label: "物品单位", prop: "packUom" }, // { label: "转换率", prop: "conversionRate" }, { label: "备注", prop: 'remark', colSpan: 12 }, // ----------------------------------------------------------------------- @@ -96,9 +96,9 @@ export const ItemPack = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 物料质检标准信息 20230328 +// 物品质检标准信息 20230328 export const AQL = [ - { label: "物料代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "供应商代码", prop: "supplierCode" }, { label: "数量上限", prop: 'ceilingQty' }, { label: "数量下限", prop: "floorQty" }, @@ -117,12 +117,12 @@ export const AQL = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 物料清单信息 20230328 +// 物品清单信息 20230328 export const Bom = [ - { label: "父物料号", prop: "product" }, - { label: "子物料号", prop: 'component' }, - { label: "子物料用量", prop: 'componentQty' }, - { label: "子物料用量单位", prop: 'componentUom' }, + { label: "父物品号", prop: "product" }, + { label: "子物品号", prop: 'component' }, + { label: "子物品用量", prop: 'componentQty' }, + { label: "子物品用量单位", prop: 'componentUom' }, { label: "开始时间", prop: "beginTime",type: "dateTime" }, { label: "结束时间", prop: "endTime", type: "dateTime" }, { label: "ERP工序", prop: "erpOp" }, @@ -171,8 +171,8 @@ export const Customer = [ // 客户物品信息 20230328 export const CustomerItem = [ { label: "客户代码", prop: 'customerCode' }, - { label: "物料代码", prop: "itemCode" }, - { label: "客户物料代码", prop: "customerItemCode" }, + { label: "物品代码", prop: "itemCode" }, + { label: "客户物品代码", prop: "customerItemCode" }, { label: "版本", prop: "version" }, { label: "开始时间", prop: "beginTime", type: "dateTime" }, { label: "结束时间", prop: "endTime" ,type: "dateTime" }, @@ -261,10 +261,10 @@ export const Supplier = [ ] // 供应商物品信息 20230328 export const SupplierItem = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, { label: "供应商代码", prop: 'supplierCode' }, - { label: "供应商物料代码", prop: "supplierItemCode" }, + { label: "供应商物品代码", prop: "supplierItemCode" }, { label: "供应商简称", prop: "SupplierSimpleName" }, { label: "版本", prop: "version" }, { label: "备注", prop: 'remark' }, @@ -465,7 +465,7 @@ export const Location = [ ] // 库位零件关系 20230331 export const ItemStoreRelation = [ - { label: "物料代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" }, { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, @@ -509,7 +509,7 @@ export const InventoryLocationCapacity = [ ] // 物品安全库存信息 20230328 export const ItemSafetyStock = [ - { label: "物料代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "仓库", prop: "warehouseCode" }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { label: "值", prop: "storeValue" }, @@ -599,7 +599,7 @@ export const ProductionLine = [ ] // 生产线零件关系 20230328 export const ProductionLineItem = [ - { label: "物料代码", prop: "itemCode" }, + { label: "物品代码", prop: "itemCode" }, { label: "生产线编号", prop: "prodLineCode" }, { label: "备注", prop: "remark" }, // ----------------------------------------------------------------------- @@ -670,10 +670,10 @@ export const Shift = [ ] // 作业指导书信息 20230328 export const ItemGuideBook = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "图片", prop: "pictureBlobName", type: "uploadPictureCard", limit: 1, picExt: ".png,.jpg" }, { label: "步骤", prop: "step", type:'textarea', rows: 5 ,readonly:true }, // ----------------------------------------------------------------------- @@ -1858,10 +1858,10 @@ export const productionReturnNote = [ // 标签查询 已调整 1 export const labelsList = [ { label: "箱码", prop: "code" }, - { label: "物料代码", prop: 'itemCode' }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品代码", prop: 'itemCode' }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "批次", prop: "lot" }, @@ -1878,8 +1878,8 @@ export const labelsList = [ { label: "供应商名称", prop: 'supplierName' }, { label: "供应商简称", prop: 'supplierSimpleName' }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "供应商物料代码", prop: 'supplierItemCode' }, - { label: "供应商物料名称", prop: 'supplierItemName' }, + { label: "供应商物品代码", prop: 'supplierItemCode' }, + { label: "供应商物品名称", prop: 'supplierItemName' }, { label: "完整条码文本", prop: "fullBarcodeString" }, { label: "发货单号", prop: "asnNumber" }, { label: "采购订单号", prop: "poNumber" }, @@ -1923,8 +1923,8 @@ export const InventoryInitialNote = [ ] // 库存余额 1 export const InventoryBalance = [ - { label: "物料代码", prop: 'itemCode' }, - { label: "物料名称", prop: "itemName" }, + { label: "物品代码", prop: 'itemCode' }, + { label: "物品名称", prop: "itemName" }, { label: "库存数量", prop: "qty" }, { label: "计量单位", prop: "uom" }, { label: "批次", prop: 'lot' }, @@ -1942,8 +1942,8 @@ export const InventoryInitialNote = [ { label: "上次盘点单号", prop: "lastCountPlanNumber" }, { label: "上次盘点标签号", prop: "lastCountLabel" }, // ----------------------------------------------------------------------- - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "标包计量单位", prop: 'stdPackUom' }, { label: "供应商批次", prop: 'supplierBatch' }, @@ -1966,9 +1966,9 @@ export const InventoryInitialNote = [ // 库存事务 1 export const InventoryTransaction = [ { label: "事务编号", prop: "transNumber" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "事务数量", prop: "qty" }, @@ -1981,7 +1981,7 @@ export const InventoryTransaction = [ { label: "事务日期", prop: "transTime",type: "dateTime" }, { label: "操作员", prop: "worker" }, // ----------------------------------------------------------------------- - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "备注", prop: 'remark' }, { label: "单位", prop: "uom" }, { label: "标包数量", prop: 'stdPackQty' }, @@ -2012,10 +2012,10 @@ export const InventorySnapshot = [ { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "序号", prop: "serialNumber" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "箱码", prop: "packingCode" }, { label: "批次", prop: "lot" }, { label: "数量", prop: "qty" }, @@ -2047,9 +2047,9 @@ export const InventoryTransferLog = [ { label: "生效日期", prop: "activeDate",type: "dateTime" }, { label: "从状态", prop: "fromStatus", type: "filter", filters: "requestStatus" }, { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, - { label: "物料描述", prop: "itemDesc1" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, + { label: "物品描述", prop: "itemDesc1" }, { label: "到货数量", prop: "qty" }, { label: "到货单位", prop: "uom" }, { label: "批次", prop: 'toLot' }, @@ -2066,7 +2066,7 @@ export const InventoryTransferLog = [ { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "任务编号", prop: "jobNumber" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "标包计量单位", prop: 'stdPackUom' }, { label: "供应商批次", prop: 'supplierBatch' }, @@ -2095,8 +2095,8 @@ export const InventoryTransferLog = [ ] // 预计出库存 1 export const expectIn = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, { label: "任务编号", prop: "jobNumber" }, { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, @@ -2111,8 +2111,8 @@ export const expectIn = [ { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "序号", prop: "serialNumber" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, { label: "创建者Id", prop: "creatorId" }, @@ -2128,8 +2128,8 @@ export const expectIn = [ ] // 预计入库存 1 export const expectOut = [ - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "itemName" }, + { label: "物品代码", prop: "itemCode" }, + { label: "物品名称", prop: "itemName" }, { label: "任务编号", prop: "jobNumber" }, { label: "箱码", prop: "packingCode" }, { label: "库位代码", prop: "locationCode" }, @@ -2144,8 +2144,8 @@ export const expectOut = [ { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "序号", prop: "serialNumber" }, - { label: "物料描述", prop: "itemDesc1" }, - { label: "物料描述2", prop: "itemDesc2" }, + { label: "物品描述", prop: "itemDesc1" }, + { label: "物品描述2", prop: "itemDesc2" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, { label: "创建者Id", prop: "creatorId" }, @@ -2719,7 +2719,7 @@ export const CountPlan = [ { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "事务代码", prop: "tenantId" }, - { label: "物料代码JSON", prop: 'jsonItemCodes' }, + { label: "物品代码JSON", prop: 'jsonItemCodes' }, { label: "库位JSON", prop: 'jsonLocationCodes' }, { label: "仓库", prop: 'warehouseCode' }, { label: "id", prop: 'id' },