diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js index bfa040c37..66456eb06 100644 --- a/fe/PC/src/utils/detailsTableColumns/index.js +++ b/fe/PC/src/utils/detailsTableColumns/index.js @@ -1492,7 +1492,6 @@ export const productionReturnNote = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number',width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -1500,38 +1499,38 @@ export const productionReturnNote = [ { label: "目标箱码", prop: 'toPackingCode' }, { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "来源库位组", prop: 'fromLocationGroup' }, { label: "目标库位组", prop: 'toLocationGroup' }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: 'toLocationCode' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐库位", prop: "recommendToLocationCode" }, - { label: "实际库位", prop: "handledToLocationCode" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, - { label: "推荐库位组", prop: "recommendToLocationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, - { label: "推荐数量", prop: "recommendQty" }, - { label: "实际数量", prop: "handledQty" }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "实际箱码", prop: "handledPackingCode" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + // { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + // { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + // { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + // { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + // { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐库位", prop: "recommendToLocationCode" }, + // { label: "实际库位", prop: "handledToLocationCode" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "推荐库位组", prop: "recommendToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, + // { label: "推荐数量", prop: "recommendQty" }, + // { label: "实际数量", prop: "handledQty" }, ] // 库存管理 @@ -1552,16 +1551,8 @@ export const pickingRequest = [ { label: "说明", prop: 'explain' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, ] @@ -1581,16 +1572,8 @@ export const pickingApproval = [ { label: "说明", prop: 'explain' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, ] @@ -1600,40 +1583,41 @@ export const pickingJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, - { label: "单位", prop: "uom" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "推荐数量", prop: "recommendQty" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "实际数量", prop: "handledQty" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "原因代码", prop: 'reasonCode' }, - { label: "说明", prop: 'explain' }, + { label: "实际箱码", prop: "handledPackingCode" }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, + // { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, + // { label: "单位", prop: "uom" }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "推荐数量", prop: "recommendQty" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + // { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + // { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + // { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + // { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + // { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐库位", prop: 'recommendFromLocationCode' }, + // { label: "推荐区域", prop: 'recommendFromLocationArea' }, + // { label: "实际区域", prop: 'handledFromLocationArea' }, + // { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + // { label: "实际分组", prop: 'handledFromLocationGroup' }, + // { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: "原因代码", prop: 'reasonCode' }, + // { label: "说明", prop: 'explain' }, + // { label: "次交易码", prop: 'onceBusiCode' }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 非生产领料记录 @@ -1644,48 +1628,48 @@ export const pickingNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "领料数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "批次", prop: 'lot' }, { label: "箱码", prop: "packingCode" }, { label: "调出库位", prop: "locationCode" }, { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' }, - { label: "说明", prop: 'explain' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "原因代码", prop: 'reasonCode' },//无 - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐数量", prop: "recommendQty" }, - { label: "实际数量", prop: "handledQty" }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, + // { label: "单位", prop: "uom" }, + // { label: "批次", prop: 'lot' }, + // { label: "说明", prop: 'explain' }, + // { label: "次交易码", prop: 'onceBusiCode' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "库区", prop: 'locationArea' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "原因代码", prop: 'reasonCode' },//无 + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "实际箱码", prop: "handledPackingCode" }, + // { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, + // { label: "实际供应商批次", prop: "handledSupplierBatch" }, + // { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, + // { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, + // { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, + // { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, + // { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, + // { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐数量", prop: "recommendQty" }, + // { label: "实际数量", prop: "handledQty" }, + // { label: "推荐库位", prop: 'recommendFromLocationCode' }, + // { label: "推荐区域", prop: 'recommendFromLocationArea' }, + // { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + // { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: "实际库位", prop: 'handledFromLocationCode' }, + // { label: "实际区域", prop: 'handledFromLocationArea' }, + // { label: "实际分组", prop: 'handledFromLocationGroup' }, + // { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, ] // 非生产退料申请 @@ -1704,16 +1688,8 @@ export const pickingNote = [ { label: "说明", prop: 'explain' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, ] @@ -1733,16 +1709,8 @@ export const materialReturnApproval = [ { label: "说明", prop: 'explain' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, ] @@ -1752,39 +1720,13 @@ export const materialReturnJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "库存状态", prop: "status",type: "filter", filters:"inventoryStage" }, - { label: "单位", prop: "uom" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "推荐数量", prop: "recommendQty" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "实际数量", prop: "handledQty" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "原因代码", prop: 'reasonCode' }, - { label: "说明", prop: 'explain' }, + { label: "实际箱码", prop: "handledPackingCode" }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, ] @@ -1795,50 +1737,13 @@ export const materialReturnNote = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, - { label: "退料数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "批次", prop: 'lot' }, + { label: "领料数量", prop: "qty" }, { label: "箱码", prop: "packingCode" }, - { label: "调入库位", prop: "locationCode" }, - { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' }, - { label: "说明", prop: 'explain' }, + { label: "调出库位", prop: "locationCode" }, + { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' }, { label: "专案代码", prop: 'caseCode' }, { label: "项目分类", prop: 'projCapacityCode' }, - { label: "次交易码", prop: 'onceBusiCode' }, { label: "任务编号", prop: 'number' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "库位组", prop: 'locationGroup' }, - { label: "库区", prop: 'locationArea' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "原因代码", prop: 'reasonCode' },//无 - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐供应商批次", prop: "recommendSupplierBatch" }, - { label: "实际供应商批次", prop: "handledSupplierBatch" }, - { label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" }, - { label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" }, - { label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" }, - { label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" }, - { label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" }, - { label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐数量", prop: "recommendQty" }, - { label: "实际数量", prop: "handledQty" }, - { label: "推荐库位", prop: "recommendToLocationCode" }, - { label: "实际库位", prop: "handledToLocationCode" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, - { label: "推荐库位组", prop: "recommendToLocationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, - { label: "备注", prop: 'remark' }, ] // 回收料收货记录 @@ -1854,18 +1759,15 @@ export const recycledMaterialsReceipt = [ { label: "箱码", prop: 'packingCode' }, { label: "库位", prop: 'locationCode' }, { label: _Names.locationErpCode, prop: 'locationErpCode' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "单据号", prop: 'number' }, { label: "备注", prop: 'remark' }, - { label: "供应商批次", prop: 'supplierBatch' }, { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "生产时间", prop: 'produceDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, { label: "库位组", prop: 'locationGroup' }, { label: "库区", prop: 'locationArea' }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "原因代码", prop: 'reasonCode' }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 回收料调整申请 @@ -1932,15 +1834,6 @@ export const materialsAdjustment = [ { label: "目标批次", prop: "toLot" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "单位", prop: "uom" }, - { label: "原因", prop: 'reasonCode' },//不是字典，直接显示文本 - { label: "从供应商批次", prop: "fromSupplierBatch" }, - { label: "到供应商批次", prop: "toSupplierBatch" }, - { label: "从到货时间", prop: "fromArriveDate", type: "dateTime" }, - { label: "到到货时间", prop: "toArriveDate", type: "dateTime" }, - { label: "从生产日期", prop: "fromProduceDate", type: "dateTime" }, - { label: "到生产日期", prop: "toProduceDate", type: "dateTime" }, - { label: "从过期时间", prop: "fromExpireDate", type: "dateTime" }, - { label: "到过期时间", prop: "toExpireDate", type: "dateTime" }, { label: "来源库区", prop: 'fromLocationArea' }, { label: "目标库区", prop: 'toLocationArea' }, { label: "来源库位组", prop: 'fromLocationGroup' }, @@ -1948,10 +1841,9 @@ export const materialsAdjustment = [ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, { label: "任务编号", prop: 'number' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 线边仓调拨申请 @@ -1962,29 +1854,29 @@ export const lineSideWarehouseAllocationRequest = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "批次", prop: "fromLot" }, - { label: "箱码", prop: "fromPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "批次", prop: "fromLot" }, + // { label: "箱码", prop: "fromPackingCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 线边仓调拨确认 @@ -1995,30 +1887,30 @@ export const lineSideWarehouseAllocationConfirm = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "调出库位", prop: "fromLocationCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 线边仓调拨记录 @@ -2029,30 +1921,30 @@ export const lineSideWarehouseAllocationNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 储位调拨记录 @@ -2063,30 +1955,30 @@ export const interStorageAllocationNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, - { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + { label: "任务编号", prop: 'number' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "在途库位", prop: "onTheWayLocationCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 客户储位调拨申请 @@ -2097,29 +1989,29 @@ export const customerStorageAllocationRequest = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "批次", prop: "fromLot" }, - { label: "箱码", prop: "fromPackingCode" }, { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "调出"+_Names.locationErpCode, prop: 'fromLocationErpCode' }, + { label: "调入"+_Names.locationErpCode, prop: 'toLocationErpCode' }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "批次", prop: "fromLot" }, + // { label: "箱码", prop: "fromPackingCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "原因", prop: 'reason' }, ] // 客户储位调拨确认 @@ -2130,30 +2022,30 @@ export const customerStorageAllocationConfirm = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, + { label: "调出库位", prop: "fromLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 客户储位调拨记录 @@ -2164,30 +2056,30 @@ export const customerStorageAllocationNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "调拨数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "调出库位", prop: "fromLocationCode" }, { label: "调入库位", prop: "toLocationCode" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + // { label: "单位", prop: "uom" }, + // { label: "调出库位", prop: "fromLocationCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 储位内移库记录 @@ -2203,7 +2095,6 @@ export const intraStorageTransferNote = [ { label: "调入库位", prop: "toLocationCode" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "任务编号", prop: 'number' }, { label: "备注", prop: 'remark' }, { label: "标包数量", prop: 'stdPackQty' }, @@ -2221,7 +2112,6 @@ export const intraStorageTransferNote = [ { label: "目标库区", prop: 'toLocationArea' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, ] // 线边仓缴库申请 @@ -2232,27 +2122,29 @@ export const lineSideWarehousePaymentRequest = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "返线数量", prop: "returnQty" }, - { label: "调出库区", prop: "rawArea" }, - { label: "调入库位", prop: "locationCode" }, - { label: "调入"+_Names.locationErpCode, prop: "locationErpCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "库区", prop: "locationArea" }, - { label: "备注", prop: 'remark' }, - { label: "生产时间", prop: "produceDate",type:"dateTime" }, - { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, - { label: "库位组", prop: "locationGroup" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "申请编号", prop: 'number' }, - { label: "批次", prop: 'lot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "Bom版本", prop: 'bomVersion' }, + { label: "目标库位", prop: "locationCode" }, + { label: "目标"+_Names.locationErpCode, prop: "locationErpCode" }, + // { label: "单位", prop: "uom" }, + // { label: "返线数量", prop: "returnQty" }, + // { label: "调出库区", prop: "rawArea" }, + // { label: "调入库位", prop: "locationCode" }, + // { label: "调入"+_Names.locationErpCode, prop: "locationErpCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "库区", prop: "locationArea" }, + // { label: "备注", prop: 'remark' }, + // { label: "生产时间", prop: "produceDate",type:"dateTime" }, + // { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, + // { label: "库位组", prop: "locationGroup" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "申请编号", prop: 'number' }, + // { label: "批次", prop: 'lot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "Bom版本", prop: 'bomVersion' }, ] -// 线边仓缴库记录 +// 线边仓缴库记录 export const lineSideWarehousePaymentNote = [ { label: _Names.itemCode, prop: "itemCode", fixed: "left" }, { label: "物品名称", prop: "itemName" }, @@ -2260,49 +2152,54 @@ export const lineSideWarehousePaymentNote = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "库区", prop:"locationArea" }, - { label: "库位代码", prop: 'locationCode' }, - { label: _Names.locationErpCode, prop:"locationErpCode" }, - { label: "生产时间", prop: "produceDate",type:"dateTime" }, - { label: "缴库库位", prop: 'rawLocationCode' }, - { label: "调出库区", prop: "rawArea" }, - { label: "箱码", prop: 'packingCode' }, - { label: "返线数量", prop: "returnQty" }, - { label: "到货时间", prop: 'arriveDate',type:"dateTime" }, - { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, - { label: "记录编号", prop: 'number' }, - { label: "批次", prop: 'lot' }, - { label: "供应商批次", prop: 'supplierBatch' }, + { label: "目标库位", prop: "handledToLocationCode" }, + { label: _Names.toErpCode, prop: "handledToLocationErpCode" }, + // todo:底盘号 + { label: "底盘号", prop: "identityNo" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "库位组", prop: 'locationGroup' }, - { label: "生产线", prop: 'prodLine' }, - { label: "Bom版本", prop: 'bomVersion' }, - { label: "推荐箱码", prop: 'recommendPackingCode' }, - { label: "实际箱码", prop: 'handledPackingCode' }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "推荐批次", prop: 'recommendLot' }, - { label: "实际批次", prop: 'handledLot' }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际数量", prop: 'handledQty' }, - { label: "推荐库位", prop: "recommendToLocationCode" }, - { label: "实际库位", prop: "handledToLocationCode" }, - { label: "推荐库区", prop: "recommendToLocationArea" }, - { label: "实际库区", prop: "handledToLocationArea" }, - { label: "推荐库位组", prop: "recommendToLocationGroup" }, - { label: "实际库位组", prop: "handledToLocationGroup" }, - { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, - { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, + { label: "任务编号", prop: "number" }, + // { label: "单位", prop: "uom" }, + // { label: "库区", prop:"locationArea" }, + // { label: "库位代码", prop: 'locationCode' }, + // { label: _Names.locationErpCode, prop:"locationErpCode" }, + // { label: "生产时间", prop: "produceDate",type:"dateTime" }, + // { label: "缴库库位", prop: 'rawLocationCode' }, + // { label: "调出库区", prop: "rawArea" }, + // { label: "箱码", prop: 'packingCode' }, + // { label: "返线数量", prop: "returnQty" }, + // { label: "到货时间", prop: 'arriveDate',type:"dateTime" }, + // { label: "过期时间", prop: "expireDate" ,type:"dateTime" }, + // { label: "记录编号", prop: 'number' }, + // { label: "批次", prop: 'lot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "库位组", prop: 'locationGroup' }, + // { label: "生产线", prop: 'prodLine' }, + // { label: "Bom版本", prop: 'bomVersion' }, + // { label: "推荐箱码", prop: 'recommendPackingCode' }, + // { label: "实际箱码", prop: 'handledPackingCode' }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + // { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + // { label: "推荐批次", prop: 'recommendLot' }, + // { label: "实际批次", prop: 'handledLot' }, + // { label: "推荐数量", prop: 'recommendQty' }, + // { label: "实际数量", prop: 'handledQty' }, + // { label: "推荐库位", prop: "recommendToLocationCode" }, + // { label: "实际库位", prop: "handledToLocationCode" }, + // { label: "推荐库区", prop: "recommendToLocationArea" }, + // { label: "实际库区", prop: "handledToLocationArea" }, + // { label: "推荐库位组", prop: "recommendToLocationGroup" }, + // { label: "实际库位组", prop: "handledToLocationGroup" }, + // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, + // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, ] // 线边仓报废申请 @@ -2369,30 +2266,30 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "调整原因代码", prop:"reasonCode" }, - { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, - { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "来源库位", prop: 'fromLocationCode' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: "目标库位", prop: 'toLocationCode' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + { label: "任务编号", prop: 'number' }, + // { label: "单位", prop: "uom" }, + // { label: "调整原因代码", prop:"reasonCode" }, + // { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, + // { label: "备注", prop: 'remark' }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "来源库位", prop: 'fromLocationCode' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "生效时间", prop: 'arriveDate', type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, ] // 线边仓调整记录 @@ -2402,31 +2299,31 @@ export const lineSideWarehouseAdjustmentSheetNote = [ { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "配置", prop: "item_configurationFromFE" }, - { label: "调整原因代码", prop:"reasonCode" }, - { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, - { label: "供应商批次", prop: "supplierBatch" }, - { label: "到货时间", prop: "arriveDate",type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "任务编号", prop: 'number' }, - { label: "备注", prop: 'remark' }, { label: "数量", prop: "qty" }, - { label: "单位", prop: "uom" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "来源库位", prop: 'fromLocationCode' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: "目标库位", prop: 'toLocationCode' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "原因", prop: 'reason' }, + { label: "任务编号", prop: 'number' }, + // { label: "调整原因代码", prop:"reasonCode" }, + // { label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" }, + // { label: "供应商批次", prop: "supplierBatch" }, + // { label: "到货时间", prop: "arriveDate",type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expireDate', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "单位", prop: "uom" }, + // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "来源库位", prop: 'fromLocationCode' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: "原因", prop: 'reason' }, ] // 库存初始化记录 @@ -2439,24 +2336,13 @@ export const InventoryInitialNote = [ { label: "配置", prop: "item_configurationFromFE" }, { label: "批次", prop: "lot" }, { label: "箱码", prop: "packingCode" }, - { label: "供应商批次", prop: "supplierBatch" }, - { label: "库位组", prop: "locationGroup" }, - { label: "库区", prop: "locationArea" }, { label: "库位", prop: "locationCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" }, { label: "备注", prop: 'remark' }, - { label: "包装数量", prop: "stdPackQty" }, - { label: "包装单位", prop: "stdPackUom" }, { label: "数量", prop: "qty" }, { label: "单位", prop: "uom" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生产日期", prop: "produceDate",type:"dateTime" }, - { label: "到货时间", prop: 'arriveDate', type: "dateTime" }, { label: "过期时间", prop: 'expireDate', type: "dateTime" }, - { label: "托标签", prop: "containerCode" }, - { label: "盘点标签", prop: "countLabel" }, - { label: "监盘操作员", prop: 'auditCountOperator' }, - { label: "监盘描述", prop: 'auditCountDescription' }, ] // 盘点计划 @@ -2746,19 +2632,11 @@ export const completDumpNoteZS = [ { label: "单位", prop: "uom" }, { label: "数量", prop: "qty" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "到货时间", prop: "arriveDate", type: "dateTime" }, - { label: "生产时间", prop: "produceDate", type: "dateTime" }, { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: "toLocationCode" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, - { label: "原因", prop: 'reason' }, - { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] @@ -2777,19 +2655,11 @@ export const completDumpNotePT = [ { label: "单位", prop: "uom" }, { label: "数量", prop: "qty" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "到货时间", prop: "arriveDate", type: "dateTime" }, - { label: "生产时间", prop: "produceDate", type: "dateTime" }, { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: "toLocationCode" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, - { label: "原因", prop: 'reason' }, - { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] @@ -2808,19 +2678,11 @@ export const completDumpNoteZP = [ { label: "单位", prop: "uom" }, { label: "数量", prop: "qty" }, { label: "标包数量", prop: 'stdPackQty' }, - { label: "到货时间", prop: "arriveDate", type: "dateTime" }, - { label: "生产时间", prop: "produceDate", type: "dateTime" }, { label: "过期时间", prop: "expireDate", type: "dateTime" }, { label: "来源库位", prop: 'fromLocationCode' }, { label: "目标库位", prop: "toLocationCode" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, - { label: "原因", prop: 'reason' }, - { label: "备注", prop: 'remark' }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] @@ -3285,47 +3147,52 @@ export const transferLibJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, - { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "请求数量", prop: 'requestQty' }, { label: "请求库位", prop: 'requestLocationCode' }, - { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, - { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, - { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, - { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, - { label: "推荐目标库位", prop: 'recommendToLocationCode' }, - { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' }, - { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, - { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, - { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, - { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, - { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源库位", prop: 'handledFromLocationCode' }, - { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, - { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, { label: "实际目标数量", prop: 'handledToQty' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, - { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, - { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, - { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, - { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, + { label: "实际目标库位", prop: 'handledToLocationCode' }, + { label: "推荐来源批次", prop: 'recommendFromLot' }, + { label: "推荐目标批次", prop: 'recommendToLot' }, + { label: "任务编号", prop: 'number' }, { label: "生产线", prop: 'prodLine' }, { label: "位置码", prop: 'positionCode' }, - { label: "推荐类型", prop: 'recommendType' }, + // { label: "实际来源数量", prop: 'handledFromQty' }, + // { label: "来源库位", prop: 'handledFromLocationCode' }, + // { label: "物品单位", prop: "uom" }, + // { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, + // { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, + // { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, + // { label: "推荐目标数量", prop: 'recommendToQty' }, + // { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + // { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, + // { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, + // { label: "推荐目标库位", prop: 'recommendToLocationCode' }, + // { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' }, + // { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + // { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + // { label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" }, + // { label: "推荐目标生产时间", prop: 'recommendToProduceDate', type: "dateTime" }, + // { label: "推荐来源到货时间", prop: 'recommendFromArriveDate', type: "dateTime" }, + // { label: "推荐目标到货时间", prop: 'recommendToArriveDate', type: "dateTime" }, + // { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + // { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + // { label: "实际来源库位", prop: 'handledFromLocationCode' }, + // { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, + // { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, + // { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, + // { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + // { label: "实际来源生产时间", prop: 'handledFromProduceDate', type: "dateTime" }, + // { label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" }, + // { label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" }, + // { label: "实际目标到货时间", prop: 'handledToArriveDate', type: "dateTime" }, + // { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + // { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + // { label: "在途库库位", prop: 'onTheWayLocationCode' }, + // { label: "推荐类型", prop: 'recommendType' }, ] // 业务库移记录 @@ -3334,52 +3201,54 @@ export const transferLibNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "物品单位", prop: "uom" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "标包数量", prop: "stdPackQty" ,isNumber:true}, - { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, - { label: "任务状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, { label: "请求数量", prop: 'requestQty' }, { label: "请求库位", prop: 'requestLocationCode' }, - { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, - { label: "请求库位组", prop: 'requestLocationGroup' }, - { label: "请求库区", prop: 'requestLocationArea' }, - { label: "推荐来源数量", prop: 'recommendFromQty' }, - { label: "推荐目标数量", prop: 'recommendToQty' }, - { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, { label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, { label: "推荐来源库位", prop: 'recommendFromLocationCode' }, { label: "推荐目标库位", prop: 'recommendToLocationCode' }, - { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' }, - { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' }, - { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, - { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, - { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, - { label: "推荐目标库区", prop: 'recommendToLocationArea' }, - { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, - { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, - { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, - { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, - { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, { label: "实际目标箱标签", prop: 'handledToPackingCode' }, - { label: "实际来源数量", prop: 'handledFromQty' }, { label: "实际目标数量", prop: 'handledToQty' }, { label: "实际来源库位", prop: 'handledFromLocationCode' }, { label: "实际目标库位", prop: 'handledToLocationCode' }, - { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, - { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, - { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, - { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, - { label: "实际来源库区", prop: 'handledFromLocationArea' }, - { label: "实际目标库区", prop: 'handledToLocationArea' }, - { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, - { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, - { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, - { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, - { label: "在途库库位", prop: 'onTheWayLocationCode' }, + { label: "任务编号", prop: 'number' }, { label: "生产线", prop: 'prodLine' }, { label: "位置码", prop: 'positionCode' }, - { label: "推荐类型", prop: 'recommendType' }, - { label: "原因", prop: 'reason' }, + // { label: "物品单位", prop: "uom" }, + // { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" }, + // { label: "任务状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" }, + // { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, + // { label: "请求库位组", prop: 'requestLocationGroup' }, + // { label: "请求库区", prop: 'requestLocationArea' }, + // { label: "推荐来源数量", prop: 'recommendFromQty' }, + // { label: "推荐目标数量", prop: 'recommendToQty' }, + // { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' }, + // { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' }, + // { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' }, + // { label: "推荐目标库位组", prop: 'recommendToLocationGroup' }, + // { label: "推荐来源库区", prop: 'recommendFromLocationArea' }, + // { label: "推荐目标库区", prop: 'recommendToLocationArea' }, + // { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' }, + // { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' }, + // { label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" }, + // { label: "推荐目标过期时间", prop: 'recommendToExpireDate', type: "dateTime" }, + // { label: "实际来源箱标签", prop: 'handledFromPackingCode' }, + // { label: "实际来源数量", prop: 'handledFromQty' }, + // { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' }, + // { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' }, + // { label: "实际来源库位组", prop: 'handledFromLocationGroup' }, + // { label: "实际目标库位组", prop: 'handledToLocationGroup ' }, + // { label: "实际来源库区", prop: 'handledFromLocationArea' }, + // { label: "实际目标库区", prop: 'handledToLocationArea' }, + // { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' }, + // { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' }, + // { label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" }, + // { label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" }, + // { label: "在途库库位", prop: 'onTheWayLocationCode' }, + // { label: "推荐类型", prop: 'recommendType' }, + // { label: "原因", prop: 'reason' }, ] // 三方库申请 @@ -3388,16 +3257,20 @@ export const ThirdLocationRequest = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "计量单位", prop: "uom" }, - { label: "数量", prop: "qty" }, + { label: "配置", prop: "item_configurationFromFE" }, + { label: "申请数量", prop: "qty" }, { label: "已发数量", prop: "issuedQty"}, { label: "已收数量", prop: "receivedQty"}, - { label: "已发未收数量", prop: "toBeIssuedQty"}, - { label: "请求未收数量", prop: "notFinishQty"}, - { label: "标包数量", prop: "stdPackQty"}, - { label: _Public.remark, prop: "remark" }, - { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + // todo:未发数量,未收数量 + { label: "来源库位", prop: 'fromLocationCode' }, + { label: "目标库位", prop: 'toLocationCode' }, + // { label: "计量单位", prop: "uom" }, + // { label: "已发未收数量", prop: "toBeIssuedQty"}, + // { label: "请求未收数量", prop: "notFinishQty"}, + // { label: "标包数量", prop: "stdPackQty"}, + // { label: _Public.remark, prop: "remark" }, + // { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + // { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 三方库任务 @@ -3406,50 +3279,52 @@ export const ThirdLocationJob = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "标包数量", prop: "stdPackQty"}, - { label: "单位", prop: "uom" }, + { label: "配置", prop: "item_configurationFromFE" }, { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, { label: "推荐数量", prop: "recommendQty" }, - { label: "实际数量", prop: 'handledQty' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "请求库位", prop: 'requestLocationCode' }, + // todo:申请数量、已发数量、已收数量、未发数量、未收数量 + { label: "实际箱码", prop: "handledPackingCode" }, { label: "在途库位", prop: 'onTheWayLocationCode' }, { label: "目标库位", prop: "toLocationCode" }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, - { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "推荐批次", prop: 'recommendLot' }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "过期时间", prop: 'expiredTime',type: "dateTime" }, - { label: "计划开始时间", prop: 'planBeginTime',type: "dateTime" }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "工序", prop: 'operation' }, - { label: "取整后数量", prop: 'roundedQty' }, - { label: "每次配送数量", prop: 'deliveryQty' }, - { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" }, - { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" }, - { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" }, - { label: "备注", prop: 'remark' }, - { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + // { label: "标包数量", prop: "stdPackQty"}, + // { label: "单位", prop: "uom" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "实际数量", prop: 'handledQty' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "请求库位", prop: 'requestLocationCode' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: "推荐库位", prop: 'recommendFromLocationCode' }, + // { label: "实际库位", prop: 'handledFromLocationCode' }, + // { label: "推荐区域", prop: 'recommendFromLocationArea' }, + // { label: "实际区域", prop: 'handledFromLocationArea' }, + // { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + // { label: "实际分组", prop: 'handledFromLocationGroup' }, + // { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, + // { label: "推荐批次", prop: 'recommendLot' }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + // { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expiredTime',type: "dateTime" }, + // { label: "计划开始时间", prop: 'planBeginTime',type: "dateTime" }, + // { label: "生产线", prop: 'prodLine' }, + // { label: "工作中心", prop: 'workStation' }, + // { label: "工序", prop: 'operation' }, + // { label: "取整后数量", prop: 'roundedQty' }, + // { label: "每次配送数量", prop: 'deliveryQty' }, + // { label: _Names.distributionType, prop: "distributionType", type: "filter", filters: "distributionType" }, + // { label: _Names.truncType, prop: "truncType", type: "filter", filters: "truncType" }, + // { label: _Names.plannedSplitRule, prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" }, + // { label: "备注", prop: 'remark' }, + // { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + // { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 三方库记录 @@ -3458,53 +3333,55 @@ export const ThirdLocationNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "单位", prop: "uom" }, - { label: "数量", prop: "qty" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "来源库位", prop: "fromLocationCode" }, - { label: "目标库位", prop: 'toLocationCode' }, - { label: "在途库位", prop: "onTheWayLocationCode" }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, - { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际数量", prop: "handledQty" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, + { label: "配置", prop: "item_configurationFromFE" }, + { label: "申请数量", prop: "qty" }, + // todo:已发数量、已收数量、未发数量、未收数量 { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐库位", prop: 'recommendFromLocationCode' }, - { label: "实际库位", prop: 'handledFromLocationCode' }, - { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, - { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, - { label: "推荐区域", prop: 'recommendFromLocationArea' }, - { label: "实际区域", prop: 'handledFromLocationArea' }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐分组", prop: 'recommendFromLocationGroup' }, - { label: "实际分组", prop: 'handledFromLocationGroup' }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "生产线", prop: 'prodLine' }, - { label: "工作中心", prop: 'workStation' }, - { label: "发料时间", prop: 'issueTime', type: "dateTime" }, - { label: "到货日期", prop: "arriveDate", type: "dateTime" }, - { label: "过期时间", prop: 'expiredTime' }, - { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + { label: "在途库位", prop: "onTheWayLocationCode" }, + { label: "目标库位", prop: 'toLocationCode' }, + // { label: "单位", prop: "uom" }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "来源库位", prop: "fromLocationCode" }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: _Names.toErpCode, prop: 'toLocationErpCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "推荐数量", prop: 'recommendQty' }, + // { label: "实际数量", prop: "handledQty" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "推荐库位", prop: 'recommendFromLocationCode' }, + // { label: "实际库位", prop: 'handledFromLocationCode' }, + // { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' }, + // { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' }, + // { label: "推荐区域", prop: 'recommendFromLocationArea' }, + // { label: "实际区域", prop: 'handledFromLocationArea' }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐分组", prop: 'recommendFromLocationGroup' }, + // { label: "实际分组", prop: 'handledFromLocationGroup' }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + // { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "生产线", prop: 'prodLine' }, + // { label: "工作中心", prop: 'workStation' }, + // { label: "发料时间", prop: 'issueTime', type: "dateTime" }, + // { label: "到货日期", prop: "arriveDate", type: "dateTime" }, + // { label: "过期时间", prop: 'expiredTime' }, + // { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + // { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 客户退货记录 @@ -3513,50 +3390,53 @@ export const customerReturnNote = [ { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, - { label: "单位", prop: "uom" }, { label: "数量", prop: "qty" }, - { label: "标包数量", prop: 'stdPackQty' }, - { label: "供应商批次", prop: 'supplierBatch' }, - { label: "来源库位", prop: "fromLocationCode" }, { label: "目标库位", prop: 'toLocationCode' }, - { label: "来源库区", prop: 'fromLocationArea' }, - { label: "目标库区", prop: 'toLocationArea' }, - { label: "来源库位组", prop: 'fromLocationGroup' }, - { label: "目标库位组", prop: 'toLocationGroup' }, - { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, { label: _Names.toErpCode, prop: 'toLocationErpCode' }, - { label: "来源批次", prop: 'fromLot' }, - { label: "目标批次", prop: 'toLot' }, - { label: "来源箱码", prop: 'fromPackingCode' }, - { label: "目标箱码", prop: 'toPackingCode' }, - { label: "推荐数量", prop: 'recommendQty' }, - { label: "实际数量", prop: "handledQty" }, - { label: "推荐箱码", prop: "recommendPackingCode" }, - { label: "实际箱码", prop: "handledPackingCode" }, - { label: "推荐库位", prop: 'recommendToLocationCode' }, - { label: "实际库位", prop: 'handledToLocationCode' }, - { label: "推荐库区", prop: 'recommendToLocationArea' }, - { label: "实际库区", prop: 'handledToLocationArea' }, - { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' }, - { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' }, - { label: "推荐批次", prop: "recommendLot" }, - { label: "实际批次", prop: "handledLot" }, - { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, - { label: "实际供应商批次", prop: 'handledSupplierBatch' }, - { label: "推荐分组", prop: 'recommendToLocationGroup' }, - { label: "实际分组", prop: 'handledToLocationGroup' }, - { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, - { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, - { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, - { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, - { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, - { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "到货日期", prop: "arriveDate", type: "dateTime" }, - { label: "生产时间", prop: 'produceDate', type: "dateTime" }, - { label: "过期时间", prop: 'expiredTime' }, - { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, + // todo:客户代码-增加、客户名称-增加 + { label: "客户代码", prop: "customerCode" }, + { label: "客户名称", prop: "customerName" }, + // { label: "单位", prop: "uom" }, + // { label: "标包数量", prop: 'stdPackQty' }, + // { label: "供应商批次", prop: 'supplierBatch' }, + // { label: "来源库位", prop: "fromLocationCode" }, + // { label: "来源库区", prop: 'fromLocationArea' }, + // { label: "目标库区", prop: 'toLocationArea' }, + // { label: "来源库位组", prop: 'fromLocationGroup' }, + // { label: "目标库位组", prop: 'toLocationGroup' }, + // { label: _Names.fromErpCode, prop: 'fromLocationErpCode' }, + // { label: "来源批次", prop: 'fromLot' }, + // { label: "目标批次", prop: 'toLot' }, + // { label: "来源箱码", prop: 'fromPackingCode' }, + // { label: "目标箱码", prop: 'toPackingCode' }, + // { label: "推荐数量", prop: 'recommendQty' }, + // { label: "实际数量", prop: "handledQty" }, + // { label: "推荐箱码", prop: "recommendPackingCode" }, + // { label: "实际箱码", prop: "handledPackingCode" }, + // { label: "推荐库位", prop: 'recommendToLocationCode' }, + // { label: "实际库位", prop: 'handledToLocationCode' }, + // { label: "推荐库区", prop: 'recommendToLocationArea' }, + // { label: "实际库区", prop: 'handledToLocationArea' }, + // { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' }, + // { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' }, + // { label: "推荐批次", prop: "recommendLot" }, + // { label: "实际批次", prop: "handledLot" }, + // { label: "推荐供应商批次", prop: 'recommendSupplierBatch' }, + // { label: "实际供应商批次", prop: 'handledSupplierBatch' }, + // { label: "推荐分组", prop: 'recommendToLocationGroup' }, + // { label: "实际分组", prop: 'handledToLocationGroup' }, + // { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" }, + // { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" }, + // { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" }, + // { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" }, + // { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" }, + // { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" }, + // { label: "备注", prop: 'remark' }, + // { label: "到货日期", prop: "arriveDate", type: "dateTime" }, + // { label: "生产时间", prop: 'produceDate', type: "dateTime" }, + // { label: "过期时间", prop: 'expiredTime' }, + // { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, + // { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // kitting打包记录 diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 9b2762a2c..8212546e9 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -159,7 +159,7 @@ export const PositionCode = [ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] -// 半成品/成品收容数 +// 半成品/成品收容数 完工转储包装数 export const ItemContainer = [ { label: "收容代码", @@ -2019,13 +2019,11 @@ export const productionReturnNote = [ width: orderWidth }, { label: "退库单号", prop: "productionReturnRequestNumber", width:orderWidth }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + { label: "任务单号", prop: 'jobNumber', width:orderWidth }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, - { label: "任务单号", prop: 'jobNumber', width:orderWidth }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, ] // 线边仓缴库申请 @@ -2038,17 +2036,10 @@ export const lineSideWarehousePaymentRequest = [ width: orderWidth }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "生产计划编号", prop: 'productionPlanNumber' }, - { label: "车间", prop: 'workshop' }, - { label: "生产线", prop: 'prodLine' }, - { label: "班次", prop: 'shift' }, - { label: "班组", prop: 'team' }, - { label: "计划日期", prop: 'planDate' }, - { label: "备注", prop: 'remark' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 线边仓缴库记录 @@ -2061,14 +2052,7 @@ export const lineSideWarehousePaymentNote = [ width: orderWidth }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "完工时间", prop: 'completeTime',type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth }, - { label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth }, - { label: "车间", prop: 'workShop' }, ] // 线边仓报废申请 @@ -2163,9 +2147,9 @@ export const InventoryInitialNote = [ type: "name", width: orderWidth }, + { label: "库存初始化请求单号", prop: "requestNumber" }, { label: "操作员", prop: 'worker' }, { label: "生效日期", prop: "activeDate" }, - { label: "库存初始化请求单号", prop: "requestNumber" }, ] // 库存余额 @@ -2240,12 +2224,12 @@ export const InventoryBalanceActive = [ { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth }, - { label: "最后盘点标签", prop: "lastCountLabel" }, + // { label: "最后盘点标签", prop: "lastCountLabel" }, { label: "标包数量", prop: "stdPackQty",isNumber:true }, { label: "库位组", prop: "locationGroup" }, { label: "库区", prop: "locationArea" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: "remark" }, { label: "到货日期", prop: "arriveDate",type: "dateTime" }, { label: "供应商批次", prop: "supplierBatch" }, @@ -2439,7 +2423,7 @@ export const safetyStockWarning = [ { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, ] -// 拆箱记录 +// 拆箱记录/标签记录 export const splitPackingList = [ { label: _Names.itemCode, @@ -2458,21 +2442,11 @@ export const splitPackingList = [ { label: "目标顶级箱码", prop: "toTopPackingCode" }, { label: "原标包数量", prop: "fromStdPackQty",isNumber:true }, { label: "目标标包数量", prop: "toStdPackQty",isNumber:true }, - { label: "原计量单位", prop: "fromUom" }, - { label: "目标计量单位", prop: "toUom" }, { label: "原批次", prop: "fromLot" }, - { label: "目标批次", prop: "toLot" }, { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" }, - { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "采购订单", prop: "purchaseInfo_PoNumber" }, { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" }, - { label: "到货通知单", prop: "arrivalNoticNumber" }, - { label: "任务单", prop: "taskOrderNumber" }, - { label: "收货记录单", prop: "receiptRecNumber" }, - { label: "上架单", prop: "putOnShelfNumber" }, - { label: "备注", prop: 'remark' }, { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 非生产领料申请 @@ -2662,11 +2636,10 @@ export const recycledMaterialsReceipt = [ type: "name", width: orderWidth }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "备注", prop: 'remark' }, + { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 回收料调整申请 @@ -2696,12 +2669,11 @@ export const materialsAdjustment = [ width: orderWidth }, { label: "申请单号", prop: "requestNumber",width: orderWidth }, - { label: "创建日期", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: "worker",}, - { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "任务单号", prop: "jobNumber" }, { label: "备注", prop: 'remark' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建日期", prop: "creationTime",type: "dateTime" }, ] // 线边仓调拨申请 @@ -2714,12 +2686,10 @@ export const lineSideWarehouseAllocationRequest = [ width: orderWidth }, { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" }, - { label: "生效日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, + { label: "生效日期", prop: "activeDate",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, ] // 线边仓调拨确认 @@ -2731,15 +2701,13 @@ export const lineSideWarehouseAllocationConfirm = [ type: "name", width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, ] // 线边仓调拨记录 @@ -2751,16 +2719,12 @@ export const lineSideWarehouseAllocationNote = [ type: "name", width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, - { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, ] // 储位调拨记录 @@ -2776,9 +2740,6 @@ export const interStorageAllocationNote = [ { label: "申请日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, ] // 客户储位调拨申请 @@ -2808,16 +2769,13 @@ export const customerStorageAllocationConfirm = [ type: "name", width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 客户储位调拨记录 @@ -2829,16 +2787,13 @@ export const customerStorageAllocationNote = [ type: "name", width: orderWidth }, - { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "调拨申请单号", prop: "requestNumber" ,width: orderWidth }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 储位内移库记录 @@ -2850,14 +2805,14 @@ export const intraStorageTransferNote = [ type: "name", width: orderWidth }, + { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, + { label: "任务单号", prop: 'jobNumber',width: orderWidth }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "移库时间", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "调拨申请单号", prop: "requestNumber",width: orderWidth }, + { label: "备注", prop: 'remark' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, ] // 线边仓调整申请 @@ -2886,13 +2841,12 @@ export const lineSideWarehouseAdjustmentSheetNote = [ type: "name", width: orderWidth }, + { label: "调整单号", prop: "requestNumber",width: orderWidth }, { label: "操作员", prop: 'worker' }, + { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "调整单号", prop: "requestNumber",width: orderWidth }, - { label: "备注", prop: 'remark' }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, ] // 盘点计划 @@ -3365,18 +3319,11 @@ export const callEmptyUtensilJob = [ { label: "器具规格", prop: "specificationsType",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"}, { label: "呼叫库位代码", prop: 'requestLocationCode' }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "承接者用户名", prop: 'acceptUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, ] // 完工转储记录（注塑） @@ -3387,14 +3334,8 @@ export const completDumpNoteZS = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: "requestNumber",width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 完工转储记录（喷涂） @@ -3405,14 +3346,8 @@ export const completDumpNotePT = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: "requestNumber",width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 完工转储记录（装配） @@ -3423,14 +3358,8 @@ export const completDumpNoteZP = [ type: "name", width: orderWidth }, - { label: "申请单号", prop: "requestNumber",width: orderWidth }, - { label: "任务单号", prop: 'jobNumber',width: orderWidth }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 注塑计划 @@ -3693,7 +3622,6 @@ export const transferLibNote = [ { label: "记录编号", prop: "number",type:"name",fixed: "left", }, { label: "申请单号", prop: 'requestNumber' }, { label: "任务单号", prop: 'jobNumber' }, - { label: "调拨类型", prop: 'type' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, @@ -3711,8 +3639,6 @@ export const ThirdLocationRequest = [ { label: "生产线", prop: 'prodLine' }, { label: "目标库位代码", prop: "toLocationCode" }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, - { label: "来源库位代码集", prop: 'fromLocationCodeJsonList' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] @@ -3761,14 +3687,8 @@ export const ThirdLocationNote = [ // 客户退货记录 export const customerReturnNote = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, - { label: "任务单号", prop: "jobNumber", width:orderWidth }, - { label: "退料单号", prop: "productionReturnRequestNumber", width:orderWidth }, - { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "退料时间", prop: 'returnTime', type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 页面锁定控制 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 4d59a3a2d..b90557dee 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -1319,12 +1319,11 @@ export const productionReturnJob = [ export const productionReturnNote = [ { label: "退库记录单号", prop: "number" }, { label: "退库单号", prop: "productionReturnRequestNumber" }, + { label: "任务单号", prop: 'jobNumber' }, { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "退料时间", prop: 'returnTime', type: "dateTime" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, ] // 标签管理 @@ -1373,12 +1372,9 @@ export const labelsList = [ // 库存初始化记录 export const InventoryInitialNote = [ { label: "单据号", prop: "number" }, - { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: "activeDate",type: "dateTime" }, { label: "库存初始化请求单号", prop: "requestNumber" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, + { label: "操作员", prop: 'worker' }, + { label: "生效日期", prop: "activeDate" }, ] // 库存余额 @@ -1400,14 +1396,14 @@ export const InventoryInitialNote = [ { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, - { label: "最后盘点标签号", prop: "lastCountLabel" }, + // { label: "最后盘点标签号", prop: "lastCountLabel" }, { label: "物品描述", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本金额", prop: "stdCost" }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, { label: "最后事务编号", prop: "lastTransNumber" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, @@ -1436,12 +1432,12 @@ export const InventoryBalanceActive = [ { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, - { label: "最后盘点标签号", prop: "lastCountLabel" }, + // { label: "最后盘点标签号", prop: "lastCountLabel" }, { label: "物品描述", prop: "itemDesc1" }, { label: "物品描述2", prop: "itemDesc2" }, { label: "标包数量", prop: 'stdPackQty' }, { label: "供应商批次", prop: 'supplierBatch' }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "备注", prop: 'remark' }, { label: "最后事务编号", prop: "lastTransNumber" }, { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" }, @@ -1518,8 +1514,8 @@ export const InventorySnapshot = [ export const InventoryTransferLog = [ { label: "库存转移编号", prop: "transferNumber" }, { label: "生效日期", prop: "activeDate",type: "dateTime" }, - { label: "从状态", prop: "fromStatus", type: "filter", filters: "requestStatus" }, - { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" }, + { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" }, + { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" }, { label: _Names.itemCode, prop: "itemCode" }, { label: "物品名称", prop: "itemName" }, { label: "物品描述1", prop: "itemDesc1" }, @@ -1600,10 +1596,10 @@ export const expectOut = [ { label: "状态", prop: "status", type: "filter", filters: "jobStatus" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "备注", prop: 'remark' }, - { label: "序号", prop: "serialNumber" }, + // { label: "序号", prop: "serialNumber" }, { label: "批次", prop: 'lot' }, { label: "单位", prop: "uom" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "到达时间", prop: "arriveDate",type:"dateTime" }, { label: "过期时间", prop: "expireDate",type:"dateTime" }, ] @@ -1627,7 +1623,7 @@ export const safetyStockWarning = [ { label: "备注", prop: 'remark' }, ] -// 拆箱记录 +// 拆箱记录/标签记录 export const splitPackingList = [ { label: _Names.itemCode, @@ -1640,27 +1636,17 @@ export const splitPackingList = [ { label: "物品描述2", prop: "itemDesc2" }, { label: "原箱箱码", prop: "fromPackingCode" }, { label: "目标箱码", prop: "toPackingCode" }, - { label: "原数量", prop: "fromQty" }, - { label: "目标数量", prop: "toQty" }, + { label: "原数量", prop: "fromQty",isNumber:true }, + { label: "目标数量", prop: "toQty",isNumber:true }, { label: "原顶级箱码", prop: "fromTopPackingCode" }, { label: "目标顶级箱码", prop: "toTopPackingCode" }, - { label: "原标包数量", prop: "fromStdPackQty" }, - { label: "目标标包数量", prop: "toStdPackQty" }, - { label: "原计量单位", prop: "fromUom" }, - { label: "目标计量单位", prop: "toUom" }, + { label: "原标包数量", prop: "fromStdPackQty",isNumber:true }, + { label: "目标标包数量", prop: "toStdPackQty",isNumber:true }, { label: "原批次", prop: "fromLot" }, - { label: "目标批次", prop: "toLot" }, { label: "方式", prop: "oprType", type: "filter", filters: "oprTypeStatus" }, - { label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" }, { label: "采购订单", prop: "purchaseInfo_PoNumber" }, { label: "供应商发货单", prop: "purchaseInfo_AsnNumber" }, - { label: "到货通知单", prop: "arrivalNoticNumber" }, - { label: "任务单", prop: "taskOrderNumber" }, - { label: "收货记录单", prop: "receiptRecNumber" }, - { label: "上架单", prop: "putOnShelfNumber" }, - { label: "备注", prop: 'remark' }, { label: "创建时间", prop: 'creationTime', type:'dateTime' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 非生产领料申请 @@ -1820,11 +1806,10 @@ export const materialReturnNote = [ // 回收料收货记录 export const recycledMaterialsReceipt = [ { label: "回收料收货记录单号", prop: "number" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "操作员", prop: "worker" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, + { label: "生效日期", prop: "activeDate" ,type: "dateTime" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 回收料调整申请 @@ -1847,57 +1832,44 @@ export const recycledMaterialsAdjustmentApply = [ export const materialsAdjustment = [ { label: "回收料调整记录单号", prop: "number" }, { label: "申请单号", prop: "requestNumber" }, - { label: "创建时间", prop: "creationTime", type: "dateTime" }, - { label: "操作员", prop: "worker" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "备注", prop: 'remark' }, + { label: "操作员", prop: "worker",}, { label: "任务单号", prop: "jobNumber" }, + { label: "备注", prop: 'remark' }, + { label: "生效日期", prop: 'activeDate', type: "dateTime" }, + { label: "创建日期", prop: "creationTime",type: "dateTime" }, ] // 线边仓调拨申请 export const lineSideWarehouseAllocationRequest = [ { label: "调拨申请单号", prop: "number" }, { label: "状态", type: "filter", filters: "requestStatus", prop: "requestStatus" }, - { label: "生效日期", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "使用在途库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "生效日期", prop: "activeDate",type:"dateTime" }, + { label: "创建时间", prop: "creationTime",type:"dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, ] // 线边仓调拨确认 export const lineSideWarehouseAllocationConfirm = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, - { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, ] // 线边仓调拨记录 export const lineSideWarehouseAllocationNote = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, - { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, ] // 储位调拨记录 @@ -1905,12 +1877,8 @@ export const interStorageAllocationNote = [ { label: "调拨单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, { label: "申请日期", prop: "activeDate",type:"dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, ] // 客户储位调拨申请 @@ -1934,77 +1902,54 @@ export const customerStorageAllocationRequest = [ export const customerStorageAllocationConfirm = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, - { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 客户储位调拨记录 export const customerStorageAllocationNote = [ { label: "调拨确认单号", prop: "number" }, { label: "调拨申请单号", prop: "requestNumber" }, - { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, - { label: "申请日期", prop: "activeDate",type:"dateTime" }, + { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "操作员", prop: "worker" }, - { label: "使用中间库", prop: 'useOnTheWayLocation',type: "filter", filters: "whetherOrNot" }, - { label: "创建时间", prop: 'creationTime', type: "dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "备注", prop: 'remark' }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, ] // 储位内移库记录 export const intraStorageTransferNote = [ { label: "移库单号", prop: "number" }, + { label: "调拨申请单号", prop: "requestNumber" }, + { label: "任务单号", prop: 'jobNumber' }, + { label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "移库时间", prop: "activeDate",type:"dateTime" }, { label: "操作员", prop: "worker" }, + { label: "备注", prop: 'remark' }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "确认时间", prop: 'confirmTime' }, - { label: "申请单号", prop: 'requestNumber' }, - { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, - { label: "备注", prop: 'remark' }, ] // 线边仓缴库申请 export const lineSideWarehousePaymentRequest = [ { label: "缴库申请单号", prop: "number" }, { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, - { label: "备注", prop: 'remark' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "生产计划编号", prop: 'productionPlanNumber' }, - { label: "车间", prop: 'workshop' }, - { label: "生产线", prop: 'prodLine' }, - { label: "班次", prop: 'shift' }, - { label: "班组", prop: 'team' }, - { label: "计划日期", prop: 'planDate' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 线边仓缴库记录 export const lineSideWarehousePaymentNote = [ { label: "缴库记录单号", prop: 'number' }, - { label: "生效日期", prop: 'activeDate',type: "dateTime" }, - { label: "完工时间", prop: 'completeTime',type: "dateTime" }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "操作员", prop: 'worker' }, - { label: "上级关联菜单号", prop: 'sourceNumber' }, - { label: "生产计划单号", prop: 'productionPlanNumber' }, - { label: "车间", prop: 'workShop' }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "备注", prop: 'remark' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, ] // 线边仓报废申请 @@ -2042,23 +1987,18 @@ export const lineSideWarehouseAdjustmentSheetRequest = [ { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" }, - { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" }, - { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" }, - { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" }, - { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, ] // 线边仓调整记录 export const lineSideWarehouseAdjustmentSheetNote = [ { label: "记录单号", prop: "number" }, + { label: "调整单号", prop: "requestNumber" }, { label: "操作员", prop: 'worker' }, + { label: "备注", prop: 'remark' }, { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: "创建时间", prop: "creationTime",type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, - { label: "调整单号", prop: "requestNumber" }, - { label: "备注", prop: 'remark' }, ] // 盘点计划 @@ -2220,18 +2160,11 @@ export const callEmptyUtensilJob = [ { label: "器具规格", prop: "specificationsType",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"}, { label: "呼叫库位代码", prop: 'requestLocationCode' }, { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" }, - { label: "任务描述", prop: 'jobDescription' }, - { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "上游任务编号", prop: 'upStreamJobNumber' }, - { label: "创建时间", prop: "creationTime",type: "dateTime" }, - { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, - { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, - { label: "承接者用户名", prop: 'acceptUserName' }, { label: "完成时间", prop: 'completeTime', type: "dateTime" }, { label: "完成者用户名", prop: 'completeUserName' }, - { label: "优先级", prop: 'priority' }, - { label: "优先级增量", prop: 'priorityIncrement' }, + { label: "创建时间", prop: "creationTime",type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, ] // 完工转储记录（注塑） @@ -2241,14 +2174,8 @@ export const completDumpNoteZS = [ fixed: "left", type: "name", }, - { label: "申请单号", prop: "requestNumber" }, - { label: "任务单号", prop: 'jobNumber' }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 完工转储记录（喷涂） @@ -2258,14 +2185,8 @@ export const completDumpNotePT = [ fixed: "left", type: "name", }, - { label: "申请单号", prop: "requestNumber" }, - { label: "任务单号", prop: 'jobNumber' }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 完工转储记录（装配） @@ -2275,14 +2196,8 @@ export const completDumpNoteZP = [ fixed: "left", type: "name", }, - { label: "申请单号", prop: "requestNumber" }, - { label: "任务单号", prop: 'jobNumber' }, { label: "操作员", prop: "worker" }, - { label: "备注", prop: 'remark' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "确认时间", prop: "confirmTime",type:"dateTime" }, { label: "创建时间", prop: "creationTime",type:"dateTime" }, - { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, ] // 注塑申请 @@ -2531,7 +2446,6 @@ export const transferLibNote = [ { label: "记录编号", prop: "number",type:"name",fixed: "left", }, { label: "申请单号", prop: 'requestNumber' }, { label: "任务单号", prop: 'jobNumber' }, - { label: "调拨类型", prop: 'type' }, { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, { label: "确认时间", prop: 'confirmTime' }, @@ -2549,8 +2463,6 @@ export const ThirdLocationRequest = [ { label: "生产线", prop: 'prodLine' }, { label: "目标库位代码", prop: "toLocationCode" }, { label: _Names.toErpCode, prop: "toLocationErpCode" }, - { label: "来源库位代码Json", prop: 'fromLocationCodeJsonList' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] @@ -2599,14 +2511,8 @@ export const ThirdLocationNote = [ // 客户退货记录 export const customerReturnNote = [ { label: "记录单号", prop: "number", fixed: "left", type: "name" }, - { label: "任务单号", prop: "jobNumber" }, - { label: "退料单号", prop: "productionReturnRequestNumber" }, - { label: "备注", prop: 'remark' }, { label: "操作员", prop: 'worker' }, - { label: "生效日期", prop: 'activeDate', type: "dateTime" }, - { label: "退料时间", prop: 'returnTime', type: "dateTime" }, { label: _Public.creationTime, prop: "creationTime", type: "dateTime" }, - { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" }, ] // 页面锁定控制