diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index e150a8be5..0cf1a9a7c 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -1350,6 +1350,14 @@ export function productionLineType(index, prop) {
label: "装配",
value: 3
},
+ 4: {
+ label: "Kitting",
+ value: 4
+ },
+ 5: {
+ label: "备品",
+ value: 5
+ },
}
return Enum(type, index, prop)
}
diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js
index d1aabff95..4ae49ece7 100644
--- a/fe/PC/src/lang/zh.js
+++ b/fe/PC/src/lang/zh.js
@@ -1,3 +1,5 @@
+const _initLocationErpCode='ERP储位'
+
export default {
// 字段通用
ColumsPublic:{
@@ -92,6 +94,18 @@ export default {
locationName:'库位名称',
projectCode:'项目代码',
projectName:'项目名称',
+ locationErpCode:_initLocationErpCode,
+ recommendErpCode:'推荐'+ _initLocationErpCode,
+ handledErpCode:'实际'+_initLocationErpCode,
+ fromErpCode:'来源'+_initLocationErpCode,
+ toErpCode:'目标'+_initLocationErpCode,
+ recommendFromErpCode:'推荐来源'+_initLocationErpCode,
+ recommendToErpCode:'推荐目标'+_initLocationErpCode,
+ handledFromErpCode:'实际来源'+_initLocationErpCode,
+ handledToErpCode:'实际目标'+_initLocationErpCode,
+ transferFromErpCode:'库移来源'+_initLocationErpCode,
+ transferToErpCode:'库移目标'+_initLocationErpCode,
+ requestLocationErpCode:'请求'+_initLocationErpCode,
},
// 接口监控看板
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 4a68cdc24..24a9cd1a4 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3,30 +3,26 @@ const orderWidth = 180
import zh from '@/lang/zh'
let _Public = zh.ColumsPublic // 字段通用
let _Names = zh.ColumsNames // 业务字段
+
// 基础数据管理
/**/
-// 字典信息 20230404
+// 字典信息
export const Dict = [
{ label: "字典项代码", prop: "code" },
{ label: "字典项名称", prop: "name" },
{ label: "字典项值", prop: "value" },
{ label: "字典项描述", prop: "description" },
{ label: "是否生效", prop: "enabled", type: "filter", filters: "whetherOrNot" },
- // -----------------------------------------------------------------------
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: 'masterId' },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
// 原料管理
-// 供应商发货通知 20230404
+// 供应商发货通知
export const SupplierAsn = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -37,7 +33,7 @@ export const SupplierAsn = [
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "recommendErpCode" },
+ { label: _Names.locationErpCode, prop: "recommendErpCode" },
{ label: "项目编号", prop: "projectCode" },
{ label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
@@ -47,7 +43,6 @@ export const SupplierAsn = [
{ label: "发货单号", prop: 'number', width: orderWidth },
{ label: "订单号", prop: 'poNumber', width: orderWidth },
{ label: "订单行", prop: 'poLine', width: orderWidth },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "标包数量", prop: 'stdPackQty' },
@@ -59,13 +54,9 @@ export const SupplierAsn = [
{ label: "备注", prop: 'remark' },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: 'masterID' },
- // ************** 确定隐藏 ************************
]
-// 采购订单信息 20230404
+// 采购订单信息
export const PurchaseOrder = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -75,7 +66,7 @@ export const PurchaseOrder = [
{ label: "发货数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "项目编号", prop: "projectCode" },
{ label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
{ label: "状态", prop: "lineStatus", type: "filter", filters: "openToClose" },
@@ -83,7 +74,6 @@ export const PurchaseOrder = [
{ label: "已收货数量", prop: "receivedQty" },
{ label: "已退货数量", prop: "returnedQty" },
{ label: "已上架数量", prop: "putAwayQty" },
- // -----------------------------------------------------------------------
{ label: "筹措员代码", prop: 'planUserCode' },
{ label: "要求到货时间", prop: "planArriveDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
@@ -99,16 +89,8 @@ export const PurchaseOrder = [
{ label: "备注", prop: 'remark' },
{ label: "订单备注", prop: 'orderRemark' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "标包计量单位", prop: 'stdPackUom' },
- // ************** 确定隐藏 ************************
- // { label: "生产时间", prop: "produceDate", type: "dateTime" },
- // { label: "lineStatus", prop: 'lineStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: 'masterID' },
- // ************** 确定隐藏 ************************
]
+
// 采购订单信息 （有关闭订单行）
export const PurchaseOrderHigher = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -119,7 +101,7 @@ export const PurchaseOrderHigher = [
{ label: "发货数量", prop: "qty" },
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "项目编号", prop: "projectCode" },
{ label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
{ label: "已发货数量", prop: "shippedQty" },
@@ -127,7 +109,6 @@ export const PurchaseOrderHigher = [
{ label: "已退货数量", prop: "returnedQty" },
{ label: "已上架数量", prop: "putAwayQty" },
{ label: "订单行状态", prop: "lineStatus",type:'filter',filters:"openToClose" },
- // -----------------------------------------------------------------------
{ label: "筹措员代码", prop: 'planUserCode' },
{ label: "要求到货时间", prop: "planArriveDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
@@ -145,16 +126,9 @@ export const PurchaseOrderHigher = [
{ label: "事务ID", prop: "tenantId" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // { label: "标包计量单位", prop: 'stdPackUom' },
- // ************** 确定隐藏 ************************
- // { label: "生产时间", prop: "produceDate", type: "dateTime" },
- // { label: "lineStatus", prop: 'lineStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: 'masterID' },
- // ************** 确定隐藏 ************************
]
-// 到货请求 20230404
+// 到货请求
export const PurchaseReceiptRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -165,15 +139,13 @@ export const PurchaseReceiptRequest = [
{ label: "物品单位", prop: "uom" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "recommendErpCode" },
+ { label: _Names.locationErpCode, prop: "recommendErpCode" },
{ label: "生产时间", prop: "produceDate", type: "dateTime" },
{ label: "过期时间", prop: "expireDate", type: "dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type:'dateTime' },
{ label: "创建者ID", prop: "creatorId" },
- // { label: "发货单号", showProp:"asnNumber", type:"outerMainFilter", width: orderWidth },//使用主表信息
{ label: "订单号", prop:'poNumber', width: orderWidth },
- // -----------------------------------------------------------------------
{ label: "单据号", prop:'number', width: orderWidth },
{ label: "备注", prop:'remark'},
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -185,13 +157,9 @@ export const PurchaseReceiptRequest = [
{ label: "供应商包装数量", prop:'supplierPackQty' },
{ label: "转换率", prop: 'convertRate' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: 'masterID' },
- // ************** 确定隐藏 ************************
]
-// 采购收货任务 20230404
+
+// 采购收货任务
export const PurchaseReceiptJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -203,7 +171,6 @@ export const PurchaseReceiptJob = [
{ label: "质量缺陷", prop: "massDefect" },
{ label: "不合格原因代码", prop: "failedReason",},
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
- // -----------------------------------------------------------------------
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "推荐箱码", prop: 'recommendPackingCode' },
{ label: "实际箱码", prop: 'handledPackingCode' },
@@ -221,14 +188,12 @@ export const PurchaseReceiptJob = [
{ label: "推荐库位", prop: 'recommendToLocationCode' },
{ label: "推荐区域", prop: 'recommendToLocationArea' },
{ label: "推荐分组", prop: 'recommendToLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' },
{ label: "计量单位", prop: 'uom' },
{ label: "实际库位", prop: 'handledToLocationCode' },
{ label: "实际区域", prop: 'handledToLocationArea' },
{ label: "实际分组", prop: 'handledToLocationGroup' },
- { label: "实际ERP库位", prop: 'handledToLocationErpCode' },
- { label: "实际仓库", prop: 'handledToWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' },
{ label: "订单号", prop: 'poNumber' },
{ label: "订单行", prop: 'poLine' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
@@ -240,14 +205,9 @@ export const PurchaseReceiptJob = [
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "类型", prop: "ctype", type: "filter", filters: "SupplierAsnCtypeSta" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: "id" },
- // { label: "主表ID", prop: 'masterID' },
- // ************** 确定隐藏 ************************
]
-// 报检单 20230410
+
+// 报检单
export const InspectRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName", width: orderWidth },
@@ -259,9 +219,8 @@ export const InspectRequest = [
{ label: "箱码", prop: "packingCode" },
{ label: "检验状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
{ label: "库位", prop: 'locationCode' },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "任务单号", prop: "number" },
- // -----------------------------------------------------------------------
{ label: "计量单位", prop: 'uom' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者Id", prop: 'creatorId' },
@@ -273,7 +232,6 @@ export const InspectRequest = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "订单号", prop: 'poNumber', width: orderWidth },
@@ -294,13 +252,9 @@ export const InspectRequest = [
{ label: "其他属性", prop: 'otherPropertyJson', width:300},
{ label: "尺寸", prop: 'volume' },
{ label: "重量", prop: 'weight' },
- // { label: "状态", prop: "status", type: "tagFilter", filters: "requestStatus" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: "id" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 检验记录 20230407
+
+// 检验记录
export const InspectNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -311,11 +265,10 @@ export const InspectNote = [
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "合格数量", prop: 'goodQty' },
{ label: "不合格数量", prop: 'failedQty' },
{ label: "检验人", prop: 'inspectUser' },
- // -----------------------------------------------------------------------
{ label: "盘点标签", prop: "containerCode" },
{ label: "破坏数量", prop: 'crackQty' },
{ label: "异常照片", prop: 'photos' },
@@ -330,7 +283,6 @@ export const InspectNote = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "订单号", prop: 'poNumber' },
@@ -343,17 +295,9 @@ export const InspectNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
{ label: "其他属性", prop: 'otherPropertyJson' },
- // { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus" },
- // { label: "不合格原因代码", prop: 'failedReason' },
- // { label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: "id" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 不合格转合格记录 已调整 20230407
+// 不合格转合格记录
export const unqualifiedToQualifiedNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -366,8 +310,7 @@ export const unqualifiedToQualifiedNote = [
{ label: "箱码", prop: "toPackingCode" },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
- { label: "ERP储位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.locationErpCode, prop: 'toLocationErpCode' },
{ label: "转合格单号", prop: "number",width: orderWidth },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
@@ -380,23 +323,16 @@ export const unqualifiedToQualifiedNote = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
-// 采购上架记录 20230410
+
+// 采购上架记录
export const PutawayNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -408,7 +344,6 @@ export const PutawayNote = [
{ label: "来源库位", prop: "fromLocationCode" },
{ label: "目标库位", prop: "toLocationCode" },
{ label: "供应商批次", prop: 'supplierBatch' },
- // -----------------------------------------------------------------------
{ label: "单据号", prop: 'number' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
@@ -426,10 +361,8 @@ export const PutawayNote = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "订单行", prop: 'poLine' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "任务编号", prop: 'jobNumber' },
@@ -451,22 +384,15 @@ export const PutawayNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 人工叫料申请 20230411
+
+// 人工叫料申请
export const IssueRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -479,11 +405,10 @@ export const IssueRequest = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "生成任务数量", prop: 'issuedQty' },
{ label: "已收数量", prop: 'receivedQty' },
{ label: "单据号", prop: 'number' },
- // -----------------------------------------------------------------------
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "生产线", prop: 'prodLine' },
{ label: "来源库区", prop: 'fromLocationArea' },
@@ -496,12 +421,9 @@ export const IssueRequest = [
{ label: "请求未发", prop: 'toBeIssuedQty' },
{ label: "已发未收", prop: 'toBeReceivedQty' },
{ label: "请求未收", prop: 'notFinishQty' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 人工发料任务 20230411
+
+// 人工发料任务
export const IssueJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -518,7 +440,6 @@ export const IssueJob = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // -----------------------------------------------------------------------
{ label: "标包数量", prop: "stdPackQty" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
@@ -527,18 +448,15 @@ export const IssueJob = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "计量单位", prop: 'uom' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "到库区", prop: 'toLocationArea' },
{ label: "到库位组", prop: 'toLocationGroup' },
- { label: "到ERP库位", prop: 'toLocationErpCode' },
- { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "实际供应商批次", prop: 'handledSupplierBatch' },
{ label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
@@ -557,15 +475,9 @@ export const IssueJob = [
{ label: "计划开始时间", prop: 'planBeginTime' },
{ label: "每次配送数量", prop: 'deliveryQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "distributionType", prop: 'distributionType' },
- // { label: "plannedSplitRule", prop: 'plannedSplitRule' },
- // { label: "truncType", prop: 'truncType' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 人工发料记录 20230411
+
+// 人工发料记录
export const IssueNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -577,18 +489,15 @@ export const IssueNote = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "来源库位", prop: "fromLocationCode" },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // -----------------------------------------------------------------------
{ label: "生效日期", prop: "arriveDate", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@@ -611,13 +520,11 @@ export const IssueNote = [
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
@@ -629,14 +536,9 @@ export const IssueNote = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 自动叫料申请 20230411
+
+// 自动叫料申请
export const automaticCallApply = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -649,11 +551,10 @@ export const automaticCallApply = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "生成任务数量", prop: 'issuedQty' },
{ label: "已收数量", prop: 'receivedQty' },
{ label: "单据号", prop: 'number' },
- // -----------------------------------------------------------------------
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "生产线", prop: 'prodLine' },
{ label: "来源库区", prop: 'fromLocationArea' },
@@ -666,12 +567,9 @@ export const automaticCallApply = [
{ label: "请求未发", prop: 'toBeIssuedQty' },
{ label: "已发未收", prop: 'toBeReceivedQty' },
{ label: "请求未收", prop: 'notFinishQty' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 自动发料任务 20230411
+
+// 自动发料任务
export const automaticCallJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -688,7 +586,6 @@ export const automaticCallJob = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // -----------------------------------------------------------------------
{ label: "标包数量", prop: "stdPackQty" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
@@ -697,18 +594,15 @@ export const automaticCallJob = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "计量单位", prop: 'uom' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "到库区", prop: 'toLocationArea' },
{ label: "到库位组", prop: 'toLocationGroup' },
- { label: "到ERP库位", prop: 'toLocationErpCode' },
- { label: "到仓库", prop: 'toWarehouseCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "实际供应商批次", prop: 'handledSupplierBatch' },
{ label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
@@ -727,15 +621,9 @@ export const automaticCallJob = [
{ label: "计划开始时间", prop: 'planBeginTime' },
{ label: "每次配送数量", prop: 'deliveryQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "plannedSplitRule", prop: 'plannedSplitRule' },
- // { label: "distributionType", prop: 'distributionType' },
- // { label: "truncType", prop: 'truncType' },
- // ************** 确定隐藏 ************************
]
-// 自动发料记录 20230411
+
+// 自动发料记录
export const automaticCallNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -747,18 +635,15 @@ export const automaticCallNote = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "来源库位", prop: "fromLocationCode" },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // -----------------------------------------------------------------------
{ label: "生效日期", prop: "arriveDate", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@@ -781,13 +666,11 @@ export const automaticCallNote = [
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
@@ -799,15 +682,9 @@ export const automaticCallNote = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
- // -----------------------------------------------------------------------
]
-// 上架前退货记录 20230412
+
+// 上架前退货记录
export const beforeGroundingReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -820,10 +697,9 @@ export const beforeGroundingReturnNote = [
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "库区", prop: 'locationArea' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
- // -----------------------------------------------------------------------
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "单据号", prop: 'number' },
@@ -836,7 +712,6 @@ export const beforeGroundingReturnNote = [
{ label: "备注", prop: 'remark' },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "订单号", prop: 'poNumber' },
@@ -847,13 +722,11 @@ export const beforeGroundingReturnNote = [
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
@@ -864,13 +737,9 @@ export const beforeGroundingReturnNote = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 上架后退货申请 20230412
+
+// 上架后退货申请
export const PurchaseReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -882,9 +751,8 @@ export const PurchaseReturnRequest = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "退货库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
- // -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -897,16 +765,11 @@ export const PurchaseReturnRequest = [
{ label: "过期时间", prop: 'expireDate' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库区", prop: 'locationArea' },
{ label: "订单行", prop: 'poLine' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
+
// 上架后退货审批
export const PurchaseReturnApprove = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -919,9 +782,8 @@ export const PurchaseReturnApprove = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "退货库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
- // -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -934,18 +796,12 @@ export const PurchaseReturnApprove = [
{ label: "过期时间", prop: 'expireDate' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库区", prop: 'locationArea' },
{ label: "订单行", prop: 'poLine' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 上架后退货任务 20230412
+// 上架后退货任务
export const PurchaseReturnJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -955,7 +811,6 @@ export const PurchaseReturnJob = [
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
- // -----------------------------------------------------------------------
{ label: "计量单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
@@ -982,21 +837,15 @@ export const PurchaseReturnJob = [
{ label: "事务ID", prop: "tenantId" },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
]
-// 上架后退货记录 20230412
+
+// 上架后退货记录
export const PurchaseReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1009,10 +858,9 @@ export const PurchaseReturnNote = [
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: 'locationCode' },
{ label: "库区", prop: 'locationArea' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
- // -----------------------------------------------------------------------
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
{ label: "单据号", prop: 'number' },
@@ -1025,7 +873,6 @@ export const PurchaseReturnNote = [
{ label: "备注", prop: 'remark' },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "订单号", prop: 'poNumber' },
@@ -1036,13 +883,11 @@ export const PurchaseReturnNote = [
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
@@ -1053,13 +898,9 @@ export const PurchaseReturnNote = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 原料报废记录 20230412
+
+// 原料报废记录
export const ScrapNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1071,8 +912,7 @@ export const ScrapNote = [
{ label: "报废原因代码", prop: 'reasonCode' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" },
{ label: "报废库位", prop: "fromLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -1089,22 +929,13 @@ export const ScrapNote = [
{ 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: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 原料直发客户记录 20230412
+
+// 原料直发客户记录
export const materialDirectSendNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1116,17 +947,14 @@ export const materialDirectSendNote = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "来源库位", prop: "fromLocationCode" },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "生效日期", prop: "arriveDate", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@@ -1157,21 +985,14 @@ export const materialDirectSendNote = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
]
-// 直接发料记录 20230413
+
+// 直接发料记录
export const directIssueNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1183,18 +1004,15 @@ export const directIssueNote = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "来源库位", prop: "fromLocationCode" },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "目标库位", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // -----------------------------------------------------------------------
{ label: "生效日期", prop: "arriveDate", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width: orderWidth },
{ label: "备注", prop: 'remark' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@@ -1217,13 +1035,11 @@ export const directIssueNote = [
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐批次", prop: "recommendLot" },
@@ -1235,17 +1051,11 @@ export const directIssueNote = [
{ label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
// 成品管理
/**/
-// 完工收货缴库申请 20230415
+// 完工收货缴库申请
export const ProductReceiptRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1257,11 +1067,10 @@ export const ProductReceiptRequest = [
{ label: "返线数量", prop: "returnQty" },
{ label: "调出库区", prop: "rawArea" },
{ label: "调入库位", prop: "locationCode" },
- { label: "调入ERP库位", prop: "locationErpCode" },
+ { label: "调入"+_Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "库区", prop: "locationArea" },
{ label: "备注", prop: 'remark' },
- // -----------------------------------------------------------------------
{ label: "创建者ID", prop: 'creatorId' },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate" ,type:"dateTime" },
@@ -1274,14 +1083,10 @@ export const ProductReceiptRequest = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "Bom版本", prop: 'bomVersion' },
- { label: "仓库", prop: "warehouseCode" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: "id" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 完工收货缴库记录 20230413
+
+// 完工收货缴库记录
export const ProductReceiptNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1292,9 +1097,8 @@ export const ProductReceiptNote = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位代码", prop: 'locationCode' },
- { label: "ERP储位", prop:"locationErpCode" },
+ { label: _Names.locationErpCode, prop:"locationErpCode" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
- // -----------------------------------------------------------------------
{ label: "缴库库位", prop: 'rawLocationCode' },
{ label: "调出库区", prop: "rawArea" },
{ label: "箱码", prop: 'packingCode' },
@@ -1305,7 +1109,6 @@ export const ProductReceiptNote = [
{ label: "批次", prop: 'lot' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "标包数量", prop: 'stdPackQty' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "生产线", prop: 'prodLine' },
{ label: "Bom版本", prop: 'bomVersion' },
@@ -1329,23 +1132,17 @@ export const ProductReceiptNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 完工收货报废申请 20230412
+
+// 完工收货报废申请
export const ProductReceiptScrapRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1356,26 +1153,21 @@ export const ProductReceiptScrapRequest = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位", prop:"locationCode" },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "报废原因代码", prop:"reasonCode" },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "记录编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 完工收货报废记录 20230412
+
+// 完工收货报废记录
export const ProductReceiptScrapNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1387,8 +1179,7 @@ export const ProductReceiptScrapNote = [
{ label: "报废原因代码", prop: 'reasonCode' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" },
{ label: "报废库位", prop: "fromLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -1409,18 +1200,11 @@ export const ProductReceiptScrapNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 半成品上架记录 20230415
+
+// 半成品上架记录
export const partiallyPreparedProductsNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1432,7 +1216,6 @@ export const partiallyPreparedProductsNote = [
{ label: "来源库位", prop: "fromLocationCode" },
{ label: "目标库位", prop: "toLocationCode" },
{ label: "供应商批次", prop: 'supplierBatch' },
- // -----------------------------------------------------------------------
{ label: "单据号", prop: 'number' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
@@ -1450,10 +1233,8 @@ export const partiallyPreparedProductsNote = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "订单行", prop: 'poLine' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "任务编号", prop: 'jobNumber' },
@@ -1475,22 +1256,15 @@ export const partiallyPreparedProductsNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 成品发货申请 20230414
+
+// 成品发货申请
export const DeliverRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1502,19 +1276,15 @@ export const DeliverRequest = [
{ label: "发货库区", prop: "areaCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 成品发货任务 20230414
+
+// 成品发货任务
export const DeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1544,30 +1314,22 @@ export const DeliverJob = [
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- // -----------------------------------------------------------------------
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 成品发货记录 20230414
+
+// 成品发货记录
export const DeliverNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1578,7 +1340,7 @@ export const DeliverNote = [
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "出货库位", prop: "fromLocationCode" },
- { label: "出货ERP库位", prop: "fromLocationErpCode" },
+ { label: "出货"+_Names.locationErpCode, prop: "fromLocationErpCode" },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
@@ -1597,10 +1359,7 @@ export const DeliverNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: 'handledLot' },
{ label: "推荐数量", prop: 'recommendQty' },
@@ -1620,21 +1379,14 @@ export const DeliverNote = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
]
-// FIS发货申请 20230414
+
+// FIS发货申请
export const FISDeliverRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1651,19 +1403,14 @@ export const FISDeliverRequest = [
{ label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
+
// 成品发运任务
export const FISDeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -1678,20 +1425,15 @@ export const FISDeliverJob = [
{ label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// FIS发货记录 20230415
+
+// FIS发货记录
export const FISDeliverNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -1702,7 +1444,7 @@ export const FISDeliverNote = [
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "出货库位", prop: "fromLocationCode" },
- { label: "出货ERP库位", prop: "fromLocationErpCode" },
+ { label: "出货"+_Names.locationErpCode, prop: "fromLocationErpCode" },
{ label: "Mes发货单号", prop: "mesDeliveryNo" },
{ label: "Mes发货计划号", prop: "mesDeliveryPlan" },
{ label: "底盘号", prop: "identityNo" },
@@ -1724,10 +1466,7 @@ export const FISDeliverNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: 'handledLot' },
{ label: "推荐数量", prop: 'recommendQty' },
@@ -1747,23 +1486,15 @@ export const FISDeliverNote = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "订单号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
- // ************** 确定隐藏 ************************
- // { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 客户退拆申请 20230415
+
+// 客户退拆申请
export const customerDismantle = [
{ label: "退拆ERP料号", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -1773,12 +1504,11 @@ export const customerDismantle = [
{ label: "退拆数量", prop: "qty" },
{ label: "单位", prop: 'uom' },
{ label: "扣账库位", prop: "locationCode" },
- { label: "扣账ERP库位", prop: 'locationErpCode' },
+ { label: "扣账"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "缴库库位", prop: 'rawLocationCode' },
- { label: "原料ERP库位", prop: 'rawLocationErpCode' },
+ { label: "原料"+_Names.locationErpCode, prop: 'rawLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width:orderWidth },
@@ -1788,15 +1518,10 @@ export const customerDismantle = [
{ label: "库区", prop: 'locationArea' },
{ label: "原料库位组", prop: 'rawLocationGroup' },
{ label: "原料库区", prop: 'rawLocationArea' },
- { label: "原料仓库", prop: 'rawWarehouseCode' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 客户退拆任务 20230415
+
+// 客户退拆任务
export const customerDismantleJob = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -1810,26 +1535,23 @@ export const customerDismantleJob = [
{ label: "库位代码", prop: 'locationCode' },
{ label: "库区", prop:"locationArea" },
{ label: "库位组", prop: 'locationGroup' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "原料库位", prop: 'rawLocationCode' },
- { label: "原料ERP库位", prop: 'rawLocationErpCode' },
+ { label: "原料"+_Names.locationErpCode, prop: 'rawLocationErpCode' },
{ label: "原料库位组", prop: 'rawLocationGroup' },
{ label: "原料库区", prop: 'rawLocationArea' },
- { label: "原料仓库", prop: 'rawWarehouseCode' },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
- { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+ { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
{ label: "推荐供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际供应商批次", prop: "handledSupplierBatch" },
{ label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
@@ -1840,13 +1562,13 @@ export const customerDismantleJob = [
{ label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
]
-// 生产退库申请 20230415
+
+// 生产退库申请
export const productionReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
{ label: "物品名称", prop: 'itemName' },
@@ -1855,10 +1577,9 @@ export const productionReturnRequest = [
{ label: "配置", prop: "item_configurationFromFE" },
{ label: "单位", prop: 'uom' },
{ label: "批次", prop: 'lot' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@@ -1870,27 +1591,19 @@ export const productionReturnRequest = [
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "目标库区", prop: 'toLocationArea' },
- // -----------------------------------------------------------------------
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "来源库位", prop: 'fromLocationCode' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 生产退库任务 20230415
+
+// 生产退库任务
export const productionReturnJob = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
{ label: "物品名称", prop: 'itemName' },
@@ -1899,7 +1612,6 @@ export const productionReturnJob = [
{ label: "配置", prop: "item_configurationFromFE" },
{ label: "数量", prop: 'recommendQty' },
{ label: "批次", prop: 'recommendLot' },
- // -----------------------------------------------------------------------
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "单位", prop: 'uom' },
{ label: "备注", prop: 'remark' },
@@ -1916,34 +1628,26 @@ export const productionReturnJob = [
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
{ label: "实际数量", prop: 'handledQty' },
{ label: "实际批次", prop: 'handledLot' },
- // -----------------------------------------------------------------------
{ label: "来源库位", prop: 'fromLocationCode' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // ************** 确定隐藏 ************************
]
-// 生产退库记录 20230413
+
+// 生产退库记录
export const productionReturnNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
{ label: "物品名称", prop: 'itemName' },
@@ -1952,9 +1656,8 @@ export const productionReturnNote = [
{ label: "配置", prop: "item_configurationFromFE" },
{ label: "数量", prop: 'qty' },
{ label: "单位", prop: 'uom' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -1976,9 +1679,6 @@ export const productionReturnNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // -----------------------------------------------------------------------
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐供应商批次", prop: "recommendSupplierBatch" },
@@ -1997,24 +1697,16 @@ export const productionReturnNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
// 库存管理
/**/
-// 非生产领料申请 20230417
+// 非生产领料申请
export const pickingRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2026,14 +1718,13 @@ export const pickingRequest = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
- { label: "调出ERP库位", prop: 'locationErpCode' },
+ { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "次交易码", prop: 'onceBusiCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
@@ -2041,18 +1732,13 @@ export const pickingRequest = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产领料审批 20230417
+
+// 非生产领料审批
export const pickingApproval = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2064,14 +1750,13 @@ export const pickingApproval = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
- { label: "调出ERP库位", prop: 'locationErpCode' },
+ { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
{ label: "次交易码", prop: 'onceBusiCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
@@ -2079,18 +1764,13 @@ export const pickingApproval = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产领料任务 20240119
+
+// 非生产领料任务
export const pickingJob = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2119,10 +1799,8 @@ export const pickingJob = [
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "原因代码", prop: 'reasonCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
@@ -2131,17 +1809,12 @@ export const pickingJob = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "备注", prop: 'remark' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产领料记录 20230417
+
+// 非生产领料记录
export const pickingNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2153,7 +1826,7 @@ export const pickingNote = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "调出库位", prop: "locationCode" },
- { label: "调出ERP库位", prop: 'locationErpCode' },
+ { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
@@ -2163,12 +1836,10 @@ export const pickingNote = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "原因代码", prop: 'reasonCode' },//无
- // -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -2190,21 +1861,15 @@ export const pickingNote = [
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产退料申请 20230417
+
+// 非生产退料申请
export const materialReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2216,7 +1881,7 @@ export const pickingNote = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
- { label: "调入ERP库位", prop: 'locationErpCode' },
+ { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
@@ -2230,18 +1895,13 @@ export const pickingNote = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产退料审批 20230417
+
+// 非生产退料审批
export const materialReturnApproval = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2253,7 +1913,7 @@ export const materialReturnApproval = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
- { label: "调入ERP库位", prop: 'locationErpCode' },
+ { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
@@ -2267,18 +1927,13 @@ export const materialReturnApproval = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产领料任务 20240119
+
+// 非生产领料任务
export const materialReturnJob = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2307,10 +1962,8 @@ export const materialReturnJob = [
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "原因代码", prop: 'reasonCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
@@ -2319,17 +1972,12 @@ export const materialReturnJob = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "备注", prop: 'remark' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 非生产退料记录 20230417
+
+// 非生产退料记录
export const materialReturnNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2341,7 +1989,7 @@ export const materialReturnNote = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "调入库位", prop: "locationCode" },
- { label: "调入ERP库位", prop: 'locationErpCode' },
+ { label: "调入"+_Names.locationErpCode, prop: 'locationErpCode' },
{ label: "说明", prop: 'explain' },
{ label: "专案代码", prop: 'caseCode' },
{ label: "项目分类", prop: 'projCapacityCode' },
@@ -2351,12 +1999,10 @@ export const materialReturnNote = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "原因代码", prop: 'reasonCode' },//无
- // -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -2381,19 +2027,13 @@ export const materialReturnNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 回收料收货记录 20230415
+
+// 回收料收货记录
export const recycledMaterialsReceipt = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2405,9 +2045,8 @@ export const recycledMaterialsReceipt = [
{ label: "批次", prop: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "库位", prop: 'locationCode' },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
@@ -2417,19 +2056,14 @@ export const recycledMaterialsReceipt = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "原因代码", prop: 'reasonCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 回收料调整申请 20230415
+
+// 回收料调整申请
export const recycledMaterialsAdjustmentApply = [
{ label: "来源ERP料号", prop: "itemCode" },
{ label: "目标ERP料号", prop: "toItemCode" },
@@ -2448,7 +2082,6 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "目标库位", prop: "toLocationCode" },
{ label: "原因", prop: 'reasonCode' },//不是字典，直接显示文本
{ label: "批次", prop: "fromLot" },
- // -----------------------------------------------------------------------
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "来源单位", prop: "fromUom" },
@@ -2458,10 +2091,8 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "目标数量", prop: "toQty" },
{ label: "从供应商批次", prop: "fromSupplierBatch" },
{ label: "到供应商批次", prop: "toSupplierBatch" },
@@ -2476,14 +2107,9 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: "id" },
- // { label: "fromStatus", prop: "fromStatus" },
- // { label: "toStatus", prop: "toStatus" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 回收料调整记录 20230415
+
+// 回收料调整记录
export const materialsAdjustment = [
{ label: "来源ERP料号", prop: "itemCode" },
{ label: "目标ERP料号", prop: "toItemCode" },
@@ -2502,10 +2128,9 @@ export const materialsAdjustment = [
{ label: "目标库位", prop: "toLocationCode" },
{ label: "来源批次", prop: "fromLot" },
{ label: "目标批次", prop: "toLot" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "单位", prop: "uom" },
{ label: "原因", prop: 'reasonCode' },//不是字典，直接显示文本
- // -----------------------------------------------------------------------
{ label: "从供应商批次", prop: "fromSupplierBatch" },
{ label: "到供应商批次", prop: "toSupplierBatch" },
{ label: "从到货时间", prop: "fromArriveDate", type: "dateTime" },
@@ -2514,15 +2139,12 @@ export const materialsAdjustment = [
{ label: "到生产日期", prop: "toProduceDate", type: "dateTime" },
{ label: "从过期时间", prop: "fromExpireDate", type: "dateTime" },
{ label: "到过期时间", prop: "toExpireDate", type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "任务编号", prop: 'number' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
@@ -2531,14 +2153,9 @@ export const materialsAdjustment = [
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: 'worker' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: "id" },
- // { label: "fromStatus", prop: "fromStatus" },
- // { label: "toStatus", prop: "toStatus" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 线边仓调拨申请 20230417
+
+// 线边仓调拨申请
export const lineSideWarehouseAllocationRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2552,7 +2169,6 @@ export const lineSideWarehouseAllocationRequest = [
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
@@ -2569,20 +2185,13 @@ export const lineSideWarehouseAllocationRequest = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 线边仓调拨确认 20230417
+
+// 线边仓调拨确认
export const lineSideWarehouseAllocationConfirm = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2596,7 +2205,6 @@ export const lineSideWarehouseAllocationConfirm = [
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
@@ -2614,20 +2222,13 @@ export const lineSideWarehouseAllocationConfirm = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 线边仓调拨记录 20230417
+
+// 线边仓调拨记录
export const lineSideWarehouseAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2641,7 +2242,6 @@ export const lineSideWarehouseAllocationNote = [
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
@@ -2659,20 +2259,13 @@ export const lineSideWarehouseAllocationNote = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 储位调拨记录 20230417
+
+// 储位调拨记录
export const interStorageAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2686,7 +2279,6 @@ export const interStorageAllocationNote = [
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
@@ -2704,20 +2296,13 @@ export const interStorageAllocationNote = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 客户储位调拨申请 20230410
+
+// 客户储位调拨申请
export const customerStorageAllocationRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2731,7 +2316,6 @@ export const customerStorageAllocationRequest = [
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
@@ -2748,20 +2332,13 @@ export const customerStorageAllocationRequest = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 客户储位调拨确认 20230410
+
+// 客户储位调拨确认
export const customerStorageAllocationConfirm = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2775,7 +2352,6 @@ export const customerStorageAllocationConfirm = [
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
@@ -2793,20 +2369,13 @@ export const customerStorageAllocationConfirm = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 客户储位调拨记录 20230410
+
+// 客户储位调拨记录
export const customerStorageAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2820,7 +2389,6 @@ export const customerStorageAllocationNote = [
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
@@ -2838,20 +2406,13 @@ export const customerStorageAllocationNote = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 储位内移库记录 20230410
+
+// 储位内移库记录
export const intraStorageTransferNote = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2863,7 +2424,6 @@ export const intraStorageTransferNote = [
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "在途库位", prop: "onTheWayLocationCode" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改者ID", prop: 'lastModifierId' },
@@ -2883,20 +2443,13 @@ export const intraStorageTransferNote = [
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 线边仓缴库申请 20230415
+
+// 线边仓缴库申请
export const lineSideWarehousePaymentRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -2908,11 +2461,10 @@ export const lineSideWarehousePaymentRequest = [
{ label: "返线数量", prop: "returnQty" },
{ label: "调出库区", prop: "rawArea" },
{ label: "调入库位", prop: "locationCode" },
- { label: "调入ERP库位", prop: "locationErpCode" },
+ { label: "调入"+_Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "库区", prop: "locationArea" },
{ label: "备注", prop: 'remark' },
- // -----------------------------------------------------------------------
{ label: "创建者ID", prop: 'creatorId' },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate" ,type:"dateTime" },
@@ -2925,14 +2477,10 @@ export const lineSideWarehousePaymentRequest = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "Bom版本", prop: 'bomVersion' },
- { label: "仓库", prop: "warehouseCode" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: "id" },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 线边仓缴库记录 20230415
+
+// 线边仓缴库记录
export const lineSideWarehousePaymentNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -2943,9 +2491,8 @@ export const lineSideWarehousePaymentNote = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位代码", prop: 'locationCode' },
- { label: "ERP储位", prop:"locationErpCode" },
+ { label: _Names.locationErpCode, prop:"locationErpCode" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
- // -----------------------------------------------------------------------
{ label: "缴库库位", prop: 'rawLocationCode' },
{ label: "调出库区", prop: "rawArea" },
{ label: "箱码", prop: 'packingCode' },
@@ -2956,7 +2503,6 @@ export const lineSideWarehousePaymentNote = [
{ label: "批次", prop: 'lot' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "标包数量", prop: 'stdPackQty' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "生产线", prop: 'prodLine' },
{ label: "Bom版本", prop: 'bomVersion' },
@@ -2980,23 +2526,17 @@ export const lineSideWarehousePaymentNote = [
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
- { label: "推荐仓库", prop: "recommendToWarehouseCode" },
- { label: "实际仓库", prop: "handledToWarehouseCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // ************** 确定隐藏 ************************
]
-// 线边仓报废申请 20230412
+
+// 线边仓报废申请
export const lineSideWarehouseScrappingRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3007,26 +2547,21 @@ export const lineSideWarehouseScrappingRequest = [
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
{ label: "库位", prop:"locationCode" },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "报废原因代码", prop:"reasonCode" },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "记录编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 线边仓报废记录 20230412
+
+// 线边仓报废记录
export const lineSideWarehouseScrappingNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3038,8 +2573,7 @@ export const lineSideWarehouseScrappingNote = [
{ label: "报废原因代码", prop: 'reasonCode' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" },
{ label: "报废库位", prop: "fromLocationCode" },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
- // -----------------------------------------------------------------------
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -3060,18 +2594,11 @@ export const lineSideWarehouseScrappingNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // ************** 确定隐藏 ************************
]
-// 线边仓调整申请 20230417
+
+// 线边仓调整申请
export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3085,7 +2612,6 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
- // -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
@@ -3104,19 +2630,12 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
]
-// 线边仓调整记录 20230417
+
+// 线边仓调整记录
export const lineSideWarehouseAdjustmentSheetNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3125,14 +2644,12 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ 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" },
@@ -3149,22 +2666,12 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "原因", prop: 'reason' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
- // { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: 'id' },
- // { label: "标包数量", prop: 'stdPackQty' },
- // { label: "fromStatus", prop: 'fromStatus' },
- // { label: "toStatus", prop: 'toStatus' },
- // ************** 确定隐藏 ************************
- ]
+]
+
// 库存初始化记录
export const InventoryInitialNote = [
{ label: "单据号", prop: "number" },
@@ -3179,8 +2686,7 @@ export const InventoryInitialNote = [
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
- // -----------------------------------------------------------------------
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "备注", prop: 'remark' },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "包装单位", prop: "stdPackUom" },
@@ -3197,13 +2703,9 @@ export const InventoryInitialNote = [
{ label: "盘点标签", prop: "countLabel" },
{ label: "监盘操作员", prop: 'auditCountOperator' },
{ label: "监盘描述", prop: 'auditCountDescription' },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
-// 盘点计划 20240415
+
+// 盘点计划
export const CountPlan = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3220,12 +2722,11 @@ export const CountPlan = [
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "初盘时间", prop: "firstCountTime",type: "dateTime" },
{ label: "初盘描述", prop: "firstCountDescription" },
{ label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "重盘数量", prop: "repeatCountQty" },
{ label: "重盘时间", prop: "repeatCountTime",type: "dateTime" },
@@ -3247,16 +2748,9 @@ export const CountPlan = [
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
- // { label: "库存状态", prop: "inventoryStatus", filters: "inventoryStage", type: "filter" },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // { label: "status", prop: "status" },
- // ************** 确定隐藏 ************************
]
-// 盘点任务 20230415
+
+// 盘点任务
export const CountJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3274,12 +2768,11 @@ export const CountJob = [
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "盘点时间", prop: 'countTime', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "盘点操作员", prop: "countOperator" },
{ label: "盘点描述", prop: "countDescription" },
- // -----------------------------------------------------------------------
{ label: "单据号", prop: 'number', width:orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "包装数量", prop: "stdPackQty" },
@@ -3292,13 +2785,9 @@ export const CountJob = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "盘点标签", prop: "countLabel" },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
-// 盘点记录 20230415
+
+// 盘点记录
export const CountNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3315,12 +2804,11 @@ export const CountNote = [
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "初盘时间", prop: "firstCountTime" ,type: "dateTime" },
{ label: "初盘描述", prop: "firstCountDescription" },
{ label: "初盘操作员", prop: "firstCountOperator" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "包装数量", prop: "stdPackQty" },
{ label: "明细状态", prop: "detailStatus", type: "filter", filters: "DetailStatus" },
{ label: "重盘数量", prop: "repeatCountQty" },
@@ -3344,15 +2832,9 @@ export const CountNote = [
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "阶段", prop: "stage",type: "filter", filters: "stageType" },
- // { label: "初盘数量", prop: "firstCountQty" },
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
-// 盘点调整申请 20230415
+
+// 盘点调整申请
export const CountPlanAdjust = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3369,11 +2851,10 @@ export const CountPlanAdjust = [
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "原因代码", prop: "reasonCode", },
{ label: "原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
- // -----------------------------------------------------------------------
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "备注", prop: 'remark' },
{ label: "单据号", prop: 'number' },
@@ -3385,21 +2866,16 @@ export const CountPlanAdjust = [
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
-// 盘点调整记录 20230415
+
+// 盘点调整记录
export const CountAdjustNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE" },
- // { label: "库存数量", prop: "inventoryQty" },
- { label: "库存数量", prop: "diffQty" },//20230705
+ { label: "库存数量", prop: "diffQty" },
{ label: "盘点数量", prop: "countQty" },
{ label: "盘点差异数量", prop: "adjustQty" },
{ label: "单位", prop: "uom" },
@@ -3409,12 +2885,11 @@ export const CountPlanAdjust = [
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "库位", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "调整原因代码", prop: "reasonCode" },
{ label: "调整原因说明", prop:"reasonCode", type: "filter", filters: "getDict" , dictType:"AdjustmentReason" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
- // -----------------------------------------------------------------------
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "生产日期", prop: "produceDate",type:"dateTime" },
{ label: "备注", prop: 'remark' },
@@ -3427,11 +2902,6 @@ export const CountPlanAdjust = [
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "盘点标签", prop: "countLabel" },
- { label: "仓库", prop: 'warehouseCode' },
- // ************** 确定隐藏 ************************
- // { label: "主表ID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
// 物品安全库存预警
@@ -3454,10 +2924,9 @@ export const safetyStockWarning = [
{ label: "单位", prop: 'uom' },
{ label: "数量", prop: 'qty' },
{ label: "标包数量", prop: 'stdPackQty' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
- { label: "ERP储位", prop: 'locationErpCode' },
+ { label: _Names.locationErpCode, prop: 'locationErpCode' },
{ label: "入库时间", prop: 'putInTime', type:"dateTime" },
{ label: "最后盘点时间", prop: 'lastCountTime', type:"dateTime" },
{ label: "最后盘点计划", prop: 'lastCountPlanNumber' },
@@ -3473,50 +2942,6 @@ export const safetyStockWarning = [
{ label: "备注", prop: 'remark' },
]
-// 拆箱记录
-// export const splitPackingList = [
-// {
-// label: "单号",
-// prop: "number",
-// fixed: "left",
-// type: "name"
-// },
-// { label: "原箱码", prop: "fromPackingCode" },
-// { label: "新签箱码", prop: "toPackingCode" },
-// { label: _Names.itemCode, prop: "itemCode" },
-// { label: "物品名称", prop: "itemName" },
-// { label: "物品描述1", prop: "itemDesc1" },
-// { label: "物品描述2", prop: "itemDesc2" },
-// { label: "配置", prop: "item_configurationFromFE" },
-// { label: "创建时间", prop: 'creationTime', type:'dateTime' },
-// { label: "标包数量", prop: "stdPackQty" },
-// { label: "数量", prop: "qty" },
-// { label: "单位", prop: "uom" },
-// { label: "供应商批次", prop: "supplierBatch" },
-// { label: "原库区", prop: "fromLocationArea" },
-// { label: "新签库区", prop: "toLocationArea" },
-// { label: "原库位代码", prop: "fromLocationCode" },
-// { label: "新签库位代码", prop: "toLocationCode" },
-// { label: "原ERP库位", prop: "fromLocationErpCode" },
-// { label: "新签ERP库位", prop: "toLocationErpCode" },
-// { label: "原库位组", prop: "fromLocationGroup" },
-// { label: "新签库位组", prop: "toLocationGroup" },
-// { label: "原批次", prop: "fromLot" },
-// { label: "新签批次", prop: "toLot" },
-// { label: "生产日期", prop: "produceDate",type: "dateTime" },
-// { label: "过期时间", prop: "expireDate",type: "dateTime" },
-// { label: "原器具号", prop: 'fromContainerCode' },
-// { label: "新签器具号", prop: 'toContainerCode' },
-// { label: "原状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
-// { label: "新签状态", prop: "toStatus",type: "filter", filters: "inventoryStage" },
-// // { label: "原仓库代码", prop: "fromWarehouseCode" },
-// // { label: "新签仓库代码", prop: "toWarehouseCode" },
-// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-// { label: "备注", prop: 'remark' },
-// { label: "原因", prop: 'reason' },
-// // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-// ]
-
// 总成量份
export const Kitting = [
{ label: _Names.itemCode, prop: 'itemCode' },
@@ -3557,14 +2982,12 @@ export const callEmptyUtensilJob = [
{ label: "实际供应商批次", prop: 'handledSupplierBatch' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
@@ -3584,11 +3007,6 @@ export const completDumpNoteZS = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ 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" },
@@ -3598,11 +3016,8 @@ export const completDumpNoteZS = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // { label: "在途库位", prop: "onTheWayLocationCode" },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
@@ -3623,11 +3038,6 @@ export const completDumpNotePT = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ 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" },
@@ -3637,11 +3047,8 @@ export const completDumpNotePT = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // { label: "在途库位", prop: "onTheWayLocationCode" },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
@@ -3662,11 +3069,6 @@ export const completDumpNoteZP = [
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ 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" },
@@ -3676,11 +3078,8 @@ export const completDumpNoteZP = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
- // { label: "在途库位", prop: "onTheWayLocationCode" },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "原因", prop: 'reason' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
@@ -3706,10 +3105,9 @@ export const IssueRequestZS = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
- { label: "到仓库", prop: 'toWarehouseCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -3726,8 +3124,7 @@ export const IssueJobZS = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -3750,10 +3147,8 @@ export const IssueJobZS = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -3774,8 +3169,8 @@ export const IssueJobZS = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -3788,8 +3183,8 @@ export const IssueJobZS = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -3798,8 +3193,6 @@ export const IssueJobZS = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -3808,6 +3201,7 @@ export const IssueJobZS = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 注塑记录
export const IssueNoteZS = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -3819,8 +3213,7 @@ export const IssueNoteZS = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -3843,10 +3236,8 @@ export const IssueNoteZS = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -3867,8 +3258,8 @@ export const IssueNoteZS = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -3881,8 +3272,8 @@ export const IssueNoteZS = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -3891,8 +3282,6 @@ export const IssueNoteZS = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -3921,18 +3310,17 @@ export const IssueRequestPT = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
- { label: "到仓库", prop: 'toWarehouseCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂任务
export const IssueJobPT = [
-
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
@@ -3942,8 +3330,7 @@ export const IssueJobPT = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -3966,10 +3353,8 @@ export const IssueJobPT = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -3990,8 +3375,8 @@ export const IssueJobPT = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4004,8 +3389,8 @@ export const IssueJobPT = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4014,8 +3399,6 @@ export const IssueJobPT = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4024,6 +3407,7 @@ export const IssueJobPT = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂记录
export const IssueNotePT = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4035,8 +3419,7 @@ export const IssueNotePT = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4059,10 +3442,8 @@ export const IssueNotePT = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4083,8 +3464,8 @@ export const IssueNotePT = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4097,8 +3478,8 @@ export const IssueNotePT = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4107,8 +3488,6 @@ export const IssueNotePT = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4137,15 +3516,15 @@ export const IssueRequestZP = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
- { label: "到仓库", prop: 'toWarehouseCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配任务
export const IssueJobZP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4157,8 +3536,7 @@ export const IssueJobZP = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4181,10 +3559,8 @@ export const IssueJobZP = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4205,8 +3581,8 @@ export const IssueJobZP = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4219,8 +3595,8 @@ export const IssueJobZP = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4229,8 +3605,6 @@ export const IssueJobZP = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4239,6 +3613,7 @@ export const IssueJobZP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配记录
export const IssueNoteZP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4250,8 +3625,7 @@ export const IssueNoteZP = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4274,10 +3648,8 @@ export const IssueNoteZP = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4298,8 +3670,8 @@ export const IssueNoteZP = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4312,8 +3684,8 @@ export const IssueNoteZP = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4322,8 +3694,6 @@ export const IssueNoteZP = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4352,15 +3722,15 @@ export const IssueRequestBP = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
- { label: "到仓库", prop: 'toWarehouseCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品任务
export const IssueJobBP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4372,8 +3742,7 @@ export const IssueJobBP = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4396,10 +3765,8 @@ export const IssueJobBP = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4420,8 +3787,8 @@ export const IssueJobBP = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4434,8 +3801,8 @@ export const IssueJobBP = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4444,8 +3811,6 @@ export const IssueJobBP = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4454,6 +3819,7 @@ export const IssueJobBP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品记录
export const IssueNoteBP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4465,8 +3831,7 @@ export const IssueNoteBP = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4489,10 +3854,8 @@ export const IssueNoteBP = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4513,8 +3876,8 @@ export const IssueNoteBP = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4527,8 +3890,8 @@ export const IssueNoteBP = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4537,8 +3900,6 @@ export const IssueNoteBP = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -4560,7 +3921,7 @@ export const transferLibRequest = [
{ label: "任务状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求库位", prop: 'requestLocationCode' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
{ label: "请求库区", prop: 'requestLocationArea' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4569,8 +3930,8 @@ export const transferLibRequest = [
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
{ label: "推荐来源库区", prop: 'recommendFromLocationArea' },
@@ -4585,6 +3946,7 @@ export const transferLibRequest = [
{ label: "推荐类型", prop: 'recommendType' },
{ label: "原因", prop: 'reason' },
]
+
// 业务库移任务
export const transferLibJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4596,14 +3958,14 @@ export const transferLibJob = [
{ label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求库位", prop: 'requestLocationCode' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "推荐目标数量", prop: 'recommendToQty' },
{ label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
{ label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
{ label: "推荐来源生产时间", prop: 'recommendFromProduceDate', type: "dateTime" },
@@ -4616,8 +3978,8 @@ export const transferLibJob = [
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
@@ -4633,6 +3995,7 @@ export const transferLibJob = [
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
]
+
// 业务库移记录
export const transferLibNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
@@ -4645,7 +4008,7 @@ export const transferLibNote = [
{ label: "任务状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求库位", prop: 'requestLocationCode' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
{ label: "请求库区", prop: 'requestLocationArea' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4654,8 +4017,8 @@ export const transferLibNote = [
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
{ label: "推荐来源库区", prop: 'recommendFromLocationArea' },
@@ -4670,8 +4033,8 @@ export const transferLibNote = [
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源库位组", prop: 'handledFromLocationGroup' },
{ label: "实际目标库位组", prop: 'handledToLocationGroup ' },
{ label: "实际来源库区", prop: 'handledFromLocationArea' },
@@ -4704,6 +4067,7 @@ export const ThirdLocationRequest = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 三方库任务
export const ThirdLocationJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
@@ -4717,23 +4081,20 @@ export const ThirdLocationJob = [
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: 'handledQty' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "请求库位", prop: 'requestLocationCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "目标库位", prop: "toLocationCode" },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
@@ -4758,6 +4119,7 @@ export const ThirdLocationJob = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 三方库记录
export const ThirdLocationNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
@@ -4775,22 +4137,20 @@ export const ThirdLocationNote = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "推荐数量", prop: 'recommendQty' },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
- { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "推荐批次", prop: "recommendLot" },
@@ -4805,8 +4165,6 @@ export const ThirdLocationNote = [
{ label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
- { label: "实际仓库", prop: 'handledFromWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "生产线", prop: 'prodLine' },
{ label: "工作中心", prop: 'workStation' },
@@ -4833,14 +4191,12 @@ export const customerReturnNote = [
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "来源ERP库位", prop: 'fromLocationErpCode' },
- { label: "目标ERP库位", prop: 'toLocationErpCode' },
+ { label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
+ { label: _Names.toErpCode, prop: 'toLocationErpCode' },
{ label: "来源批次", prop: 'fromLot' },
{ label: "目标批次", prop: 'toLot' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
- { label: "来源仓库", prop: 'fromWarehouseCode' },
- { label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "推荐数量", prop: 'recommendQty' },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
@@ -4849,8 +4205,8 @@ export const customerReturnNote = [
{ label: "实际库位", prop: 'handledToLocationCode' },
{ label: "推荐库区", prop: 'recommendToLocationArea' },
{ label: "实际库区", prop: 'handledToLocationArea' },
- { label: "推荐ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "实际ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.recommendErpCode, prop: 'recommendToLocationErpCode' },
+ { label: _Names.handledErpCode, prop: 'handledToLocationErpCode' },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
@@ -4863,8 +4219,6 @@ export const customerReturnNote = [
{ label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
{ label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
{ label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
- { label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "到货日期", prop: "arriveDate", type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
@@ -4905,10 +4259,9 @@ export const KittingIssueRequest = [
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "目标库位组", prop: 'toLocationGroup' },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
- { label: "到仓库", prop: 'toWarehouseCode' },
{ label: "生产线", prop: 'prodLine' },
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -4926,8 +4279,7 @@ export const KittingIssueJob = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -4950,10 +4302,8 @@ export const KittingIssueJob = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -4974,8 +4324,8 @@ export const KittingIssueJob = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -4988,8 +4338,8 @@ export const KittingIssueJob = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -4998,8 +4348,6 @@ export const KittingIssueJob = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -5020,8 +4368,7 @@ export const KittingIssueNote = [
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: "请求库位区域", prop: 'requestLocationArea' },
{ label: "请求库位组", prop: 'requestLocationGroup' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
- { label: "请求仓库代码", prop: 'requestWarehouseCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "在途库位", prop: 'onTheWayLocationCode' },
{ label: "请求数量", prop: 'requestQty' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
@@ -5044,10 +4391,8 @@ export const KittingIssueNote = [
{ label: "推荐目标库区", prop: 'recommendToLocationArea' },
{ label: "推荐来源分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐目标分组", prop: 'recommendToLocationGroup' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
- { label: "推荐来源仓库", prop: 'recommendFromWarehouseCode' },
- { label: "推荐目标仓库", prop: "recommendToWarehouseCode" },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "库移来源数量", prop: 'transferLibFromQty' },
{ label: "库移目标数量", prop: 'transferLibToQty' },
{ label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
@@ -5068,8 +4413,8 @@ export const KittingIssueNote = [
{ label: "库移目标库区", prop: 'transferLibToLocationArea' },
{ label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
{ label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
- { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
- { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: _Names.transferFromErpCode, prop: 'transferLibFromLocationErpCode' },
+ { label: _Names.transferToErpCode, prop: 'transferLibToLocationErpCode' },
{ label: "实际来源数量", prop: 'handledFromQty' },
{ label: "实际目标数量", prop: 'handledToQty' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -5082,8 +4427,8 @@ export const KittingIssueNote = [
{ label: "实际目标库区", prop: 'handledToLocationArea' },
{ label: "实际来源分组", prop: 'handledFromLocationGroup' },
{ label: "实际目标分组", prop: 'handledToLocationGroup' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
{ label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
{ label: "实际来源到货时间", prop: 'handledFromArriveDate', type: "dateTime" },
@@ -5092,8 +4437,6 @@ export const KittingIssueNote = [
{ label: "实际目标生产时间", prop: 'handledToProduceDate', type: "dateTime" },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
{ label: "实际目标过期时间", prop: 'handledToExpireDate', type: "dateTime" },
- { label: "实际来源仓库", prop: 'handledFromWarehouseCode' },
- { label: "实际目标仓库", prop: "handledToWarehouseCode" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
@@ -5110,15 +4453,15 @@ export const isPadForTransferLibJob = [
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "请求数量", prop: 'requestQty' },
- { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
{ label: "推荐目标数量", prop: 'recommendToQty' },
{ label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' },
{ label: "推荐目标库位", prop: 'recommendToLocationCode' },
- { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
- { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: _Names.recommendFromErpCode, prop: 'recommendFromLocationErpCode' },
+ { label: _Names.recommendToErpCode, prop: 'recommendToLocationErpCode' },
{ label: "推荐来源批次", prop: 'recommendFromLot' },
{ label: "推荐目标批次", prop: 'recommendToLot' },
{ label: "推荐来源过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
@@ -5129,8 +4472,8 @@ export const isPadForTransferLibJob = [
{ label: "实际目标箱标签", prop: 'handledToPackingCode' },
{ label: "实际来源库位", prop: 'handledFromLocationCode' },
{ label: "实际目标库位", prop: 'handledToLocationCode' },
- { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
- { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: _Names.handledFromErpCode, prop: 'handledFromLocationErpCode' },
+ { label: _Names.handledToErpCode, prop: 'handledToLocationErpCode' },
{ label: "实际来源批次", prop: 'handledFromLot' },
{ label: "实际目标批次", prop: 'handledToLot' },
{ label: "实际来源过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js
index 6c3e65ccd..3a8805025 100644
--- a/fe/PC/src/utils/summaryTableColumns/index.js
+++ b/fe/PC/src/utils/summaryTableColumns/index.js
@@ -3,9 +3,10 @@
const orderWidth = 180
import zh from '@/lang/zh'
let _Names = zh.ColumsNames // 业务字段
+
// 原料管理
/**/
-// 报检单 20230410
+// 报检单
export const InspectRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -16,7 +17,6 @@ export const InspectRequest = [
{ label: "检验数量", prop: 'inspectQty' },
{ label: "合格数量", prop: 'goodQty' },
{ label: "不合格数量", prop: 'failedQty' },
- // -----------------------------------------------------------------------
{ label: "检验人", prop: 'inspectUser' },
{ label: "任务单号", prop: "number" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -42,12 +42,9 @@ export const InspectRequest = [
{ label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// 检验记录 字段需要确定
+
+// 检验记录
export const InspectNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -62,7 +59,6 @@ export const InspectNote = [
{ label: "检验人", prop: 'inspectUser' },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
- // -----------------------------------------------------------------------
{ label: "单据号", prop: "number" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
@@ -81,8 +77,4 @@ export const InspectNote = [
{ label: "最终不合格数量", prop: 'notPassedQty' },
{ label: "事务ID", prop: "tenantId" },
{ label: "检验类型", prop: "inspectType", type: "filter", filters: "inspectType" },
- // ************** 确定隐藏 ************************
- // { label: "masterID", prop: "masterID" },
- // { label: "ID", prop: "id" },
- // ************** 确定隐藏 ************************
]
\ No newline at end of file
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 5c8b3aa5a..985eeae00 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -32,9 +32,6 @@ export const ItemBasic = [
// { label: _Names.productLine, prop: 'productLine' },
// { label: _Names.elevel, prop: 'elevel' },
// { label: _Names.color, prop: "color" },
- // ---------------------------------------
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
// { label: _Names.group, prop: "group" },
{ label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
// { label: _Names.project, prop: "project" },
@@ -44,6 +41,8 @@ export const ItemBasic = [
{ label: _Names.validityUnit, prop: "validityUnit", type: "filter", filters: "validityUnit" },
{ label: _Names.manageType, prop: "manageType", type: "filter", filters: "manageType" },
{ label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
// {
// label: _Public.operation,
// type:"buttonOperation",
@@ -52,6 +51,7 @@ export const ItemBasic = [
// fixed: "right"
// },
]
+
// 物品质量信息
export const ItemQuality = [
{
@@ -68,18 +68,12 @@ export const ItemQuality = [
{ label: _Names.supplierName, prop: 'supplierName' },
{ label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" },
{ label: _Names.inspectType, prop: 'inspectType', type: "filter", filters: "inspectType" },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
{ label: _Public.remark, prop: "remark" },
{ label: _Public.description, prop: "description" },
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 物品分类信息
export const ItemCategory = [
{
@@ -90,17 +84,11 @@ export const ItemCategory = [
},
{ label: _Names.categoryCode, prop: 'categoryCode' },
{ label: _Names.categoryValue, prop: 'value' },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- // {
- // label: _Public.creationTime,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
+
// 物品包装信息
export const ItemPack = [
{
@@ -123,33 +111,8 @@ export const ItemPack = [
{ label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type:'dateTime' },
- // {
- // label: _Public.creationTime,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
-]
-// 收容数标包
-export const ItemContainer = [
- {
- label: "收容代码",
- prop: "containerCode",
- fixed: "left",
- type: "name"
- },
- { label: "收容代码描述", prop: "containerName" },
- { label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "item_nameFromFE",showProp:true },
- { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
- { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
- { label: '转储标包数量', prop: "qty" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "备注", prop: 'remark', colSpan: 12 },
]
+
// 物品质检标准信息
export const AQL = [
{
@@ -173,14 +136,49 @@ export const AQL = [
{ label: _Public.remark, prop: "remark" },
{ label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type:'dateTime' },
- // {
- // label: _Public.creationTime,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
+
+// 位置码
+export const PositionCode = [
+ {
+ label: '位置码',
+ prop: "code",
+ fixed: "left",
+ type: "name"
+ },
+ { label: "位置码类型", prop: 'type', type: "filter", filters: "positionCodeType" },
+ { label: _Names.itemCode, prop: "partCode" },
+ { label: _Names.itemName, prop: "partName" },
+ { label: _Names.itemDesc1, prop: "partDesc" },
+ { label: _Names.basicUom, prop: "basicUom" },
+ { label: "箱数/数量", prop: "stdPackQty",isNumber:true },
+ { label: "目标库位代码", prop: "locationCode" },
+ { label: "目标库位名称", prop: "locationName" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
+// 半成品/成品收容数
+export const ItemContainer = [
+ {
+ label: "收容代码",
+ prop: "containerCode",
+ fixed: "left",
+ type: "name"
+ },
+ { label: "收容代码描述", prop: "containerName" },
+ { label: _Names.itemCode, prop: "itemCode" },
+ { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
+ { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
+ { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
+ { label: '转储标包数量', prop: "qty" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
// 物品清单信息
export const Bom = [
{
@@ -195,26 +193,20 @@ export const Bom = [
{ label: _Names.componentName, prop: "componentName",showProp:true },
{ label: _Names.componentDesc1, prop: "componentDesc1",showProp:true },
{ label: _Names.componentQty, prop: 'componentQty',isNumber:true },
- { label: _Names.componentUom, prop: 'componentUom' },
- { label: _Names.erpOp, prop: "erpOp" },
- { label: _Names.mfgOp, prop: "mfgOp" },
- { 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: _Names.componentUom, prop: 'componentUom' },
+ // { label: _Names.erpOp, prop: "erpOp" },
+ // { label: _Names.mfgOp, prop: "mfgOp" },
+ // { 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: _Names.layer, prop: "layer" },
{ label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
{ label: _Public.endTime, prop: "endTime", type: "dateTime" },
{ label: _Public.remark, prop: 'remark' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: 'lastModificationTime', type: "dateTime" },
- { label: _Names.layer, prop: "layer" },
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
+
// 物品清单信息 - 详情【父物品信息、子物品信息】
export const BomInner = [
{
@@ -229,32 +221,14 @@ export const BomInner = [
{ label: _Names.componentName, prop: "componentName",showProp:true },
{ label: _Names.componentDesc1, prop: "componentDesc1",showProp:true },
{ label: _Names.componentQty, prop: 'componentQty',isNumber:true },
- { label: _Names.componentUom, prop: 'componentUom' },
- { label: _Names.erpOp, prop: "erpOp" },
- { label: _Names.mfgOp, prop: "mfgOp" },
- { 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: _Names.layer, prop: "layer" },
{ label: _Public.beginTime, prop: "beginTime", type:'dateTime' },
{ label: _Public.endTime, prop: "endTime", type:'dateTime' },
{ label: _Public.remark, prop: 'remark' },
- { label: _Names.layer, prop: "layer" },
{ label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type:'dateTime' },
- // ************** 确认隐藏 ************************
- // { label: _Names.tenantId, prop: "tenantId" },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: 'id' },
- // ************** 确认隐藏 ************************
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
+
// 客户信息
export const Customer = [
{
@@ -264,30 +238,20 @@ export const Customer = [
type: "name"
},
{ label: _Names.customerName, prop: "name" },
+ { label: _Names.customerShortName, prop: "shortName" },
+ { label: _Names.address, prop: "address" },
{ label: _Names.contact, prop: "contacts" },
{ label: _Names.phone, prop: "phone" },
{ label: _Names.fax, prop: "fax" },
{ label: _Names.postID, prop: "postID" },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- { label: _Public.remark, prop: "remark" },
- { label: _Names.customerShortName, prop: "shortName" },
- { label: _Names.address, prop: "address" },
{ label: _Names.country, prop: "country" },
{ label: _Names.city, prop: "city" },
{ label: _Names.currency, prop: "currency" },
- // ************** 确认隐藏 ************************
- // { label: _Public.status, prop: "isActive", type: "filter", filters: "openToCloseBit" },
- // { label: _Public.type, prop: 'type' },
- // ************** 确认隐藏 ************************
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 客户物品信息
export const CustomerItem = [
{
@@ -299,21 +263,16 @@ export const CustomerItem = [
{ label: _Names.customerItemCode, prop: "customerItemCode" },
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.customerPackQty, prop: "customerPackQty",isNumber:true },
- { label: _Names.customerPackUom, prop: "customerPackUom" },
+ { label: _Names.customerPackUom, prop: "customerPackUom", width:160 },
{ label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
{ label: _Public.endTime, prop: "endTime", type: "dateTime" },
{ label: _Public.remark, prop: 'remark' },
+ { label: _Names.version, prop: 'version' },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- { label: _Names.version, prop: 'version' },
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
+
]
+
// 客户地址信息
export const CustomerAddress = [
{ label: _Names.customerCode,
@@ -321,25 +280,18 @@ export const CustomerAddress = [
fixed: "left",
type: "name"
},
- { label: _Names.customerAdrName, prop: "name" },
{ label: _Names.customerAdrCode, prop: "code" },
- { label: _Names.warehouseCode, prop: "warehouseCode" },
+ { label: _Names.customerAdrName, prop: "name" },
{ label: _Names.locationCode, prop: "locationCode" },
{ label: _Names.city, prop: "city" },
{ label: _Names.address, prop: "address" },
{ label: _Names.contact, prop: "contact" },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime" },
{ label: _Public.remark, prop: "remark" },
{ label: _Public.description, prop: "desc" },
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime" },
]
+
// 客户项目信息
export const Project = [
{
@@ -352,19 +304,13 @@ export const Project = [
{ label: _Names.customerCode, prop: "customerCode" },
{ label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
{ label: _Public.endTime, prop: "endTime", type: "dateTime" },
+ { label: _Public.remark, prop: "remark" },
{ label: _Public.description, prop: "description" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- { label: _Public.remark, prop: "remark" },
- // {
- // label: _Public.operation,
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 供应商信息 20230328
+
+// 供应商信息
export const Supplier = [
{
label: "供应商代码",
@@ -388,15 +334,9 @@ export const Supplier = [
{ label: "城市", prop: 'city' },
{ label: "银行", prop: 'bank' },
{ label: "货币", prop: 'currency' },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 供应商物品信息 20230328
+
+// 供应商物品信息
export const SupplierItem = [
{
label: "供应商代码",
@@ -414,15 +354,9 @@ export const SupplierItem = [
{ label: "备注", prop: "remark" },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 供应商时间窗口 20230328
+
+// 供应商时间窗口
export const SupplierTimeWindow = [
{
label: "供应商代码",
@@ -436,39 +370,25 @@ export const SupplierTimeWindow = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 收货口信息 20230328
+
+// 收货口信息
export const Dock = [
{
- label: "仓库代码",
+ label: "收货口代码",
fixed: "left",
type: "name",
- prop: "warehouseCode"
+ prop: "code"
},
- { label: "默认库位代码", prop: "defaultLocationCode" },
- { label: "收货口代码", prop: "code" },
{ label: "收货口名称", prop: 'name' },
+ { label: "默认库位代码", prop: "defaultLocationCode" },
{ label: "描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 区域信息 20230328
+
+// 区域信息
export const Area = [
{
label: "区域代码",
@@ -483,15 +403,9 @@ export const Area = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 库位组信息 20230328
+
+// 库位组信息
export const LocationGroup = [
{
label: "库位组代码",
@@ -501,7 +415,6 @@ export const LocationGroup = [
},
{ label: "区域代码", prop: "areaCode" },
{ label: "库位组名称", prop: 'name' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
{ label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" },
{ label: "拣料优先级", prop: "pickPriority" },
@@ -526,15 +439,9 @@ export const LocationGroup = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 工作组信息 20230328
+
+// 工作组信息
export const WorkGroup = [
{
label: "工作组代码",
@@ -543,20 +450,13 @@ export const WorkGroup = [
prop: "code"
},
{ label: "工作组名称", prop: 'name' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "描述", prop: "description" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 库位信息 20230328
+
+// 库位信息
export const Location = [
{
label: "库位代码",
@@ -565,7 +465,6 @@ export const Location = [
prop: "code"
},
{ label: "库位名称", prop: "name" },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "区域代码", prop: "areaCode" },
{ label: "库位组代码", prop: "locationGroupCode" },
{ label: "工作组代码", prop: "workGroupCode" },
@@ -596,15 +495,9 @@ export const Location = [
{ label: "描述", prop: "description" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 库位零件关系 20230331
+
+// 库位零件关系
export const ItemStoreRelation = [
{
label: _Names.itemCode,
@@ -612,7 +505,6 @@ export const ItemStoreRelation = [
fixed: "left",
type: "name"
},
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
{ label: "值", prop: "storeValue" },
{ label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
@@ -627,15 +519,9 @@ export const ItemStoreRelation = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 库位可用容量信息 20230331
+
+// 库位可用容量信息
export const InventoryLocationCapacity = [
{
label: "库位代码",
@@ -650,15 +536,8 @@ export const InventoryLocationCapacity = [
{ label: "已用容量", prop: "usedCapacity" },
{ label: "可承受过载容量", prop: "bearableOverloadCapacity" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 物品安全库存信息 20230328
+// 物品安全库存信息
export const ItemSafetyStock = [
{
label: _Names.itemCode,
@@ -669,7 +548,6 @@ export const ItemSafetyStock = [
{ label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
{ label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
{ label: "配置", prop: "item_configurationFromFE",showProp:true },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
{ label: "存储关系代码", prop: "storeValue" },
{ label: "最大库存", prop: "maxStock" },
@@ -681,15 +559,9 @@ export const ItemSafetyStock = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 事务类型信息 20230328
+
+// 事务类型信息
export const TransactionType = [
{
label: "事务ID",
@@ -715,21 +587,8 @@ export const TransactionType = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
{ label: "描述", prop: "description" },
- // ************** 确认隐藏 ************************
- // { label: "自动提交审批", prop: 'autoSubmitRequest', type: "filter", filters: "whetherOrNot" },
- // { label: "自动审批通过", prop: 'autoAgreeRequest', type: "filter", filters: "whetherOrNot" },
- // { label: "自动执行", prop: 'autoHandleRequest', type: "filter", filters: "whetherOrNot" },
- // { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
- // { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑',
- // buttonName:'edit',
- // fixed: "right"
- // },
]
+
// 库存开账
export const InventoryBilling = [
{ label: _Names.itemCode, prop: "itemCode", type: "name" },
@@ -743,7 +602,7 @@ export const InventoryBilling = [
{ label: "备注", prop: "remark" },
]
-// 车间信息 20230328
+// 车间信息
export const Workshop = [
{
label: "车间代码",
@@ -756,15 +615,9 @@ export const Workshop = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 生产线信息 20230328
+
+// 生产线信息
export const ProductionLine = [
{ label: "生产线代码", prop: "code", fixed: "left", type: "name" },
{ label: "生产线名称", prop: 'name' },
@@ -774,7 +627,8 @@ export const ProductionLine = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 生产线零件关系 20230328
+
+// 生产线零件关系
export const ProductionLineItem = [
{ label: _Names.itemCode, prop: "itemCode", type: "name" },
{ label: "物品名称", prop: "itemName" },
@@ -788,7 +642,8 @@ export const ProductionLineItem = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 工作中心信息 20230328
+
+// 工作中心信息
export const WorkCenter = [
{
label: "编号",
@@ -805,15 +660,9 @@ export const WorkCenter = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 班组信息 20230328
+
+// 班组信息
export const Team = [
{
label: "编号",
@@ -827,15 +676,9 @@ export const Team = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "成员", prop: "members" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 班次信息 20230328
+
+// 班次信息
export const Shift = [
{
label: "班次代码",
@@ -851,15 +694,9 @@ export const Shift = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 作业指导书信息 20230328
+
+// 作业指导书信息
export const ItemGuideBook = [
{
label: _Names.itemCode,
@@ -875,15 +712,9 @@ export const ItemGuideBook = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "步骤", prop: "step" },
{ label: "图片存储名称", prop: "pictureBlobName" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 账期信息 20230328
+
+// 账期信息
export const accountPeriodNote = [
{
label: "代码",
@@ -902,7 +733,8 @@ export const accountPeriodNote = [
{ label: "转换生效时间", prop: "convertToTime", type:'dateTime' },
{ label: "描述", prop: "description" },
]
-// 字典信息 20230328
+
+// 字典信息
export const Dict = [
{
label: "字典编号",
@@ -915,15 +747,9 @@ export const Dict = [
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 分类信息 20230328
+
+// 分类信息
export const Category = [
{
label: "分类代码",
@@ -936,15 +762,9 @@ export const Category = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 计量单位信息 20230328
+
+// 计量单位信息
export const Uom = [
{
label: "计量单位编号",
@@ -958,15 +778,9 @@ export const Uom = [
{ label: "备注", prop: "remark" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 日历信息 20230328
+
+// 日历信息
export const Calendar = [
{
label: "模块",
@@ -980,15 +794,9 @@ export const Calendar = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "开始时间", prop: "beginTime",type: "dateTime" },
{ label: "结束时间", prop: "endTime", type: "dateTime" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 配置信息 20230328 暂无接口
+
+// 配置信息
export const Configuration = [
{
label: "键",
@@ -999,15 +807,9 @@ export const Configuration = [
{ label: "值", prop: "value" },
{ label: "描述", prop: "description" },
{ label: "备注", prop: "remark" },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 文档信息 20230328
+
+// 文档信息
export const documentBasic = [
{
label: "编码",
@@ -1026,18 +828,8 @@ export const documentBasic = [
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
+
// 标准成本价格单
export const StdCostPriceSheet = [
{
@@ -1056,6 +848,7 @@ export const StdCostPriceSheet = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
]
+
// 采购价格单
export const PurchasePriceSheet = [
{
@@ -1076,6 +869,7 @@ export const PurchasePriceSheet = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
]
+
// 销售价格单
export const SalePriceSheet = [
{
@@ -1099,7 +893,8 @@ export const SalePriceSheet = [
// 原料管理
-// 供应商发货通知 20230404
+/**/
+// 供应商发货通知
export const SupplierAsn = [
{
label: "发货单号",
@@ -1128,15 +923,9 @@ export const SupplierAsn = [
{ label: "到期日期", prop: 'dueDate', type: "dateTime" },
{ label: "时间窗口", prop: 'timeWindow' },
{ label: "筹措员代码", prop: 'planUserCode' },
- // ************** 确认隐藏 ************************
- // { label: "status", prop: 'status' },
- // { label: "createType", prop: 'createType' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 采购订单信息 20230404
+
+// 采购订单信息
export const PurchaseOrder = [
{
label: "采购订单号",
@@ -1163,13 +952,8 @@ export const PurchaseOrder = [
{ label: "版本", prop: 'version' },
{ label: "税率", prop: 'taxRate' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // ************** 确认隐藏 ************************
- // { label: "orderStatus", prop: 'orderStatus' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
+
// 采购订单信息 （有关闭订单行）
export const PurchaseOrderHigher = [
{
@@ -1196,14 +980,9 @@ export const PurchaseOrderHigher = [
{ label: "版本", prop: 'version' },
{ label: "税率", prop: 'taxRate' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // ************** 确认隐藏 ************************
- // { label: "orderStatus", prop: 'orderStatus' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 到货请求 20230404
+
+// 到货请求
export const PurchaseReceiptRequest = [
{
label: "到货单号",
@@ -1228,15 +1007,9 @@ export const PurchaseReceiptRequest = [
{ label: "车牌号", prop: 'truckNumber' },
{ label: "收货口", prop: 'dockCode' },
{ label: "时间窗口", prop: 'timeWindow' },
- // ************** 确认隐藏 ************************
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 采购收货任务 20230404
+
+// 采购收货任务
export const PurchaseReceiptJob = [
{
label: "收货任务编号",
@@ -1259,7 +1032,6 @@ export const PurchaseReceiptJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "要货计划单号", prop: 'rpNumber' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1270,17 +1042,9 @@ export const PurchaseReceiptJob = [
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "时间窗口", prop: 'timeWindow' },
- // ************** 确认隐藏 ************************
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "完成者ID", prop: 'completeUserId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 采购收货记录 已调整 20230404
+
+// 采购收货记录
export const PurchaseReceiptNote = [
{
label: "收货单号",
@@ -1303,12 +1067,9 @@ export const PurchaseReceiptNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "任务代码", prop: 'jobNumber' },
- // ************** 确认隐藏 ************************
- // { label: "type", prop: 'type' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 采购收货记录-详情【合格品收货明细】 20230404
+
+// 采购收货记录-详情【合格品收货明细】
export const qualifiedInfo = [
{
label: "检验单号",
@@ -1326,7 +1087,7 @@ export const qualifiedInfo = [
{ label: "物品单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1335,8 +1096,8 @@ export const qualifiedInfo = [
{ label: "订单行", prop: "poLine" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty",isNumber:true },
{ label: "实际数量", prop: "handledQty",isNumber:true },
{ label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
@@ -1360,9 +1121,6 @@ export const qualifiedInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
- { label: "仓库代码", prop: 'warehouseCode' },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
- { label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "不合格原因代码", prop: 'failedReason' },
@@ -1370,11 +1128,9 @@ export const qualifiedInfo = [
{ label: "质量缺陷", prop: "massDefect" },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
- // ************** 确认隐藏 ************************
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 采购收货记录-详情【不合格品收货明细】 20230404
+
+// 采购收货记录-详情【不合格品收货明细】
export const unqualifiedInfo = [
{
label: "检验单号",
@@ -1392,7 +1148,7 @@ export const unqualifiedInfo = [
{ label: "物品单位", prop: "uom" },
{ label: "原箱码", prop: "fromPackingCode" },
// { label: "拆箱箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "不合格原因代码", prop: 'failedReason' },
{ label: "不合格原因说明", prop: 'failedReason', type: "filter", filters: "getDict" , dictType:"UnqualifiedReason" },
{ label: "质量缺陷", prop: "massDefect" },
@@ -1405,8 +1161,8 @@ export const unqualifiedInfo = [
{ label: "订单行", prop: "poLine" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "推荐数量", prop: "recommendQty",isNumber:true },
{ label: "实际数量", prop: "handledQty" ,isNumber:true},
{ label: "推荐批次到货日期", prop: "recommendArriveDate",type: "dateTime" },
@@ -1431,25 +1187,20 @@ export const unqualifiedInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
- { label: "仓库代码", prop: 'warehouseCode' },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
- { label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
- // ************** 确认隐藏 ************************
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 采购收货记录-详情【收货缺料明细】 20230404
+
+// 采购收货记录-详情【收货缺料明细】
export const lackMaterialsInfo = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "批次", prop: "lot" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "单据号", prop: "number" },
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1459,8 +1210,8 @@ export const lackMaterialsInfo = [
{ label: "箱码", prop: "packingCode" },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
- { label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
- { label: "实际ERP库位", prop: "handledToLocationErpCode" },
+ { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
+ { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
{ label: "物品单位", prop: "uom" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "推荐数量", prop: "recommendQty",isNumber:true },
@@ -1488,9 +1239,6 @@ export const lackMaterialsInfo = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "推荐批次供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际批次供应商批次", prop: "handledSupplierBatch" },
- { label: "仓库代码", prop: 'warehouseCode' },
- { label: "推荐仓库", prop: 'recommendToWarehouseCode' },
- { label: "实际仓库", prop: 'handledToWarehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "目检照片Json", prop: 'inspectPhotoJson' },
{ label: "不合格原因代码", prop: 'failedReason' },
@@ -1498,11 +1246,9 @@ export const lackMaterialsInfo = [
{ label: "质量缺陷", prop: "massDefect" },
{ label: "供应商包装计量单位", prop: "supplierPackUom" },
{ label: "供应商包装数量", prop: "supplierPackQty",isNumber:true },
- // ************** 确认隐藏 ************************
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 报检单 20230410
+
+// 报检单
export const InspectRequest = [
{
label: "检验单号",
@@ -1520,7 +1266,6 @@ export const InspectRequest = [
{ label: "供应商代码", prop: "supplierCode" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
@@ -1533,17 +1278,9 @@ export const InspectRequest = [
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "完成者ID", prop: 'completeUserId' },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "nextAction", prop: 'nextAction' },
- // ************** 确认隐藏 ************************
]
-// 检验记录 20230407
+
+// 检验记录
export const InspectNote = [
{
label: "检验单号",
@@ -1565,14 +1302,9 @@ export const InspectNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 不合格库存（不合格转合格） 已调整
+
+// 不合格库存（不合格转合格）
export const unqualifiedToQualified = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" },
@@ -1586,7 +1318,7 @@ export const unqualifiedToQualified = [
{ label: "库位", prop: 'locationCode' },
{ label: "入库时间", prop: 'putInTime',type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "标包数量", prop: "stdPackQty",isNumber:true },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "供应商批次", prop: 'supplierBatch' },
@@ -1594,7 +1326,6 @@ export const unqualifiedToQualified = [
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "序号", prop: 'serialNumber' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "最后盘点时间", prop: 'lastCountTime' },
@@ -1603,16 +1334,9 @@ export const unqualifiedToQualified = [
{ label: "是否可用", prop: 'isActive' },
{ label: "最后事务号", prop: 'lastTransNumber' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "ID", prop: 'id' },
- // { label: "manageType", prop: 'manageType' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 不合格转合格记录 已调整 20230407
+
+// 不合格转合格记录 已调整
export const unqualifiedToQualifiedNote = [
{
label: "转合格单号",
@@ -1627,7 +1351,8 @@ export const unqualifiedToQualifiedNote = [
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
]
-// 采购上架记录 20230410
+
+// 采购上架记录
export const PutawayNote = [
{
label: "上架记录单号",
@@ -1651,14 +1376,9 @@ export const PutawayNote = [
{ label: "发货单号", prop: 'asnNumber' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "完工收货单号", prop: 'productReceiptNumber' },
- // ************** 确认隐藏 ************************
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 人工叫料申请 20230411
+
+// 人工叫料申请
export const IssueRequest = [
{
label: "叫料申请编号",
@@ -1673,22 +1393,13 @@ export const IssueRequest = [
{ label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
- // { label: "叫料类型", prop: 'type' },
{ label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { 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: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 人工发料任务 20230411
+
+// 人工发料任务
export const IssueJob = [
{
label: "发料任务编号",
@@ -1704,7 +1415,6 @@ export const IssueJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1718,16 +1428,9 @@ export const IssueJob = [
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "完成者", prop: 'completeUserId' },
- // ************** 确认隐藏 ************************
]
-// 人工发料记录 20230411
+
+// 人工发料记录
export const IssueNote = [
{
label: "发料记录单号",
@@ -1748,13 +1451,9 @@ export const IssueNote = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 自动叫料申请 20230411
+
+// 自动叫料申请
export const automaticCallApply = [
{
label: "叫料申请编号",
@@ -1769,23 +1468,13 @@ export const automaticCallApply = [
{ label: "备注", prop: 'remark' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
- // { label: "叫料类型", prop: 'type' },
{ label: "备料计划单号", prop: 'preparationPlanNumber',width: orderWidth },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { 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: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 自动发料任务 20230411
+
+// 自动发料任务
export const automaticCallJob = [
{
label: "发料任务编号",
@@ -1801,7 +1490,6 @@ export const automaticCallJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1815,16 +1503,9 @@ export const automaticCallJob = [
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "完成者ID", prop: 'completeUserId' },
- // ************** 确认隐藏 ************************
]
-// 自动发料记录 20230411
+
+// 自动发料记录
export const automaticCallNote = [
{
label: "发料记录单号",
@@ -1845,13 +1526,9 @@ export const automaticCallNote = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime',type: "dateTime" },
- // ************** 确认隐藏 ************************
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // ************** 确认隐藏 ************************
]
-// 上架前退货记录 20230412
+
+// 上架前退货记录
export const beforeGroundingReturnNote = [
{
label: "退货单号",
@@ -1872,15 +1549,9 @@ export const beforeGroundingReturnNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "订单号", prop: 'poNumber' },
{ label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "returnType", prop: 'returnType' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货申请 20230412
+
+// 上架后退货申请
export const PurchaseReturnRequest = [
{ label: "退货申请单号",
prop: "number",
@@ -1899,20 +1570,9 @@ export const PurchaseReturnRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "收货单号", prop: 'rpNumber' },
- // ************** 确认隐藏 ************************
- // { 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: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "returnType", prop: 'returnType' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "returnType", prop: 'returnType' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货审批 20240229
+
+// 上架后退货审批
export const PurchaseReturnApprove = [
{ label: "退货申请单号",
prop: "number",
@@ -1937,14 +1597,10 @@ export const PurchaseReturnApprove = [
// { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
// { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
// { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "returnType", prop: 'returnType' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "returnType", prop: 'returnType' },
// ************** 确认隐藏 ************************
]
-// 上架后退货任务 20230412
+
+// 上架后退货任务
export const PurchaseReturnJob = [
{
label: "退货任务编号",
@@ -1965,7 +1621,6 @@ export const PurchaseReturnJob = [
{ label: "供应商代码", prop: "supplierCode" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1977,16 +1632,9 @@ export const PurchaseReturnJob = [
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "收货单号", prop: 'rpNumber' },
- // ************** 确认隐藏 ************************
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "完成者", prop: 'completeUserId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 上架后退货记录 20230412
+
+// 上架后退货记录
export const PurchaseReturnNote = [
{
label: "退货记录单号",
@@ -2007,15 +1655,9 @@ export const PurchaseReturnNote = [
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "收货单号", prop: 'rpNumber',width: orderWidth },
{ label: "退货请求单号", prop: 'purchaseReturnRequestNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "returnType", prop: 'returnType' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 原料报废记录 20230412
+
+// 原料报废记录
export const ScrapNote = [
{
label: "报废记录单号",
@@ -2031,14 +1673,9 @@ export const ScrapNote = [
{ label: "备注", prop: 'remark' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 原料直发客户记录 20230412
+
+// 原料直发客户记录
export const materialDirectSendNote = [
{
label: "发货单号",
@@ -2059,14 +1696,9 @@ export const materialDirectSendNote = [
{ label: "发货申请单号", prop: 'deliverRequestNumber',width: orderWidth },
{ label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 直接发料记录 20230413
+
+// 直接发料记录
export const directIssueNote = [
{
label: "发料记录单号",
@@ -2087,16 +1719,11 @@ export const directIssueNote = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
// 成品管理
/**/
-// 完工收货缴库申请 20230415
+// 完工收货缴库申请
export const ProductReceiptRequest = [
{
label: "缴库申请单号",
@@ -2117,19 +1744,9 @@ export const ProductReceiptRequest = [
{ label: "班组", prop: 'team' },
{ label: "计划日期", prop: 'planDate' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 完工收货缴库记录 20230413
+
+// 完工收货缴库记录
export const ProductReceiptNote = [
{
label: "缴库记录单号",
@@ -2147,16 +1764,9 @@ export const ProductReceiptNote = [
{ label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth },
{ label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth },
{ label: "车间", prop: 'workShop' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // { label: "receiptType", prop: 'receiptType' },
- // ************** 确认隐藏 ************************
]
-// 完工收货报废申请 20230412
+
+// 完工收货报废申请
export const ProductReceiptScrapRequest = [
{
label: "报废申请单号",
@@ -2170,21 +1780,11 @@ export const ProductReceiptScrapRequest = [
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
- { label: "报废类型", prop: 'type' },
+ { label: "报废类型", prop: 'type' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 完工收货报废记录 20230412
+// 完工收货报废记录
export const ProductReceiptScrapNote = [
{
label: "报废记录单号",
@@ -2200,14 +1800,9 @@ export const ProductReceiptScrapNote = [
{ label: "备注", prop: 'remark' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 半成品上架记录 20230415
+
+// 半成品上架记录
export const partiallyPreparedProductsNote = [
{
label: "上架记录单号",
@@ -2230,14 +1825,9 @@ export const partiallyPreparedProductsNote = [
{ label: "发货单号", prop: 'asnNumber' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "完工收货单号", prop: 'productReceiptNumber' },
- // ************** 确认隐藏 ************************
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 成品发货申请 20230414
+
+// 成品发货申请
export const DeliverRequest = [
{
label: "发货申请单号",
@@ -2256,18 +1846,9 @@ export const DeliverRequest = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 成品发货任务 20230414
+
+// 成品发货任务
export const DeliverJob = [
{
label: "发货任务编号",
@@ -2284,7 +1865,6 @@ export const DeliverJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -2297,16 +1877,9 @@ export const DeliverJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
- // ************** 确认隐藏 ************************
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "完成者ID", prop: 'completeUserId' },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 成品发货记录 20230414
+
+// 成品发货记录
export const DeliverNote = [
{
label: "发货记录单号",
@@ -2328,13 +1901,9 @@ export const DeliverNote = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
]
-// FIS发货申请 20230414
+
+// FIS发货申请
export const FISDeliverRequest = [
{
label: "发货申请单号",
@@ -2343,7 +1912,6 @@ export const FISDeliverRequest = [
type: "name",
width: orderWidth
},
- // { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
@@ -2353,16 +1921,6 @@ export const FISDeliverRequest = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
// 成品发运任务
@@ -2379,20 +1937,15 @@ export const FISDeliverJob = [
{ label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
- // -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "事务ID", prop: "tenantId" },
- // { label: "起始底盘号",prop: 'extraProperties',type:"object", showProp: 'FromVinCode' },
- // ************** 确定隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "主表ID", prop: "masterID" },
- // ************** 确定隐藏 ************************
]
-// FIS发货记录 20230415
+
+// FIS发货记录
export const FISDeliverNote = [
{
label: "发货记录单号",
@@ -2414,13 +1967,9 @@ export const FISDeliverNote = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "发货类型", prop: "deliverRequestType", type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 客户退拆申请 20230415
+
+// 客户退拆申请
export const customerDismantle = [
{
label: "退拆申请单号",
@@ -2437,19 +1986,9 @@ export const customerDismantle = [
{ label: "班次", prop: 'shift' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 客户退拆任务 20230415
+
+// 客户退拆任务
export const customerDismantleJob = [
{
label: "退拆任务单号",
@@ -2469,14 +2008,14 @@ export const customerDismantleJob = [
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "车间", prop: 'workshop' },
{ label: "班次", prop: 'shift' },
]
-// 客户退拆记录 20230415
+
+// 客户退拆记录
export const customerDismantleNote = [
{
label: "退拆记录单号",
@@ -2494,13 +2033,9 @@ export const customerDismantleNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "申请编号", prop: 'requestNumber', width:orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 客户退拆记录-明细【即回冲记录】 20230415
+
+// 客户退拆记录-明细【即回冲记录】
export const customerDismantleBackFlushNote = [
{ label: "退拆物品号", prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2512,7 +2047,8 @@ export const customerDismantleBackFlushNote = [
{ label: "转移料号（子零件号）", prop: 'rawItemCode' },
{ label: "转移量（子零件）", prop: 'rawQty',isNumber:true },
]
-// 生产退库申请 20230415
+
+// 生产退库申请
export const productionReturnRequest = [
{
label: "退库申请单号",
@@ -2527,18 +2063,9 @@ export const productionReturnRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 生产退库任务 20230415
+
+// 生产退库任务
export const productionReturnJob = [
{
label: "退库任务单号",
@@ -2553,7 +2080,6 @@ export const productionReturnJob = [
{ label: "操作员", prop: 'worker' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber',width:orderWidth },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -2564,16 +2090,9 @@ export const productionReturnJob = [
{ label: "完成者用户名", prop: 'completeUserName' },
{ label: "完成时间", prop: 'completeTime', type: "dateTime" },
{ label: "任务描述", prop: 'jobDescription' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "承接者ID", prop: 'acceptUserId' },
- // { label: "完成者ID", prop: 'completeUserId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
]
-// 生产退库记录 20230413
+
+// 生产退库记录
export const productionReturnNote = [
{
label: "退库记录单号",
@@ -2590,13 +2109,9 @@ export const productionReturnNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "退料时间", prop: 'returnTime', type: "dateTime" },
{ label: "任务单号", prop: 'jobNumber', width:orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 线边仓缴库申请 20230415
+
+// 线边仓缴库申请
export const lineSideWarehousePaymentRequest = [
{
label: "缴库申请单号",
@@ -2617,19 +2132,9 @@ export const lineSideWarehousePaymentRequest = [
{ label: "班组", prop: 'team' },
{ label: "计划日期", prop: 'planDate' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓缴库记录 20230415
+
+// 线边仓缴库记录
export const lineSideWarehousePaymentNote = [
{
label: "缴库记录单号",
@@ -2647,16 +2152,9 @@ export const lineSideWarehousePaymentNote = [
{ label: "上级关联菜单号", prop: 'sourceNumber',width: orderWidth },
{ label: "生产计划单号", prop: 'productionPlanNumber',width: orderWidth },
{ label: "车间", prop: 'workShop' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // { label: "receiptType", prop: 'receiptType' },
- // ************** 确认隐藏 ************************
]
-// 线边仓报废申请 20230412
+
+// 线边仓报废申请
export const lineSideWarehouseScrappingRequest = [
{
label: "报废申请单号",
@@ -2671,19 +2169,9 @@ export const lineSideWarehouseScrappingRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "报废类型", prop: 'type' },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 线边仓报废记录 20230412
+
+// 线边仓报废记录
export const lineSideWarehouseScrappingNote = [
{
label: "报废记录单号",
@@ -2698,18 +2186,11 @@ export const lineSideWarehouseScrappingNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "任务ID", prop: 'jobNumber' },
- // { label: "报废类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
// 标签管理
/**/
-// 标签查询 20230410
+// 标签查询
export const labelsList = [
{
label: "箱码",
@@ -2725,10 +2206,10 @@ export const labelsList = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "库位", prop: "recommendLocationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
- { label: "备注", prop: "remark" },
+ { label: "备注", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"},
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
@@ -2766,11 +2247,11 @@ export const InventoryInitialNote = [
width: orderWidth
},
{ label: "操作员", prop: 'worker' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "生效日期", prop: "activeDate" },
{ label: "库存初始化请求单号", prop: "requestNumber" },
]
-// 库存余额 20230407
+
+// 库存余额
export const InventoryBalance = [
{
label: _Names.itemCode,
@@ -2792,7 +2273,7 @@ export const InventoryBalance = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@@ -2810,12 +2291,11 @@ export const InventoryBalance = [
{ label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
-// 库存余额(解/冻) 20230407
+// 库存余额(解/冻)
export const InventoryBalanceActive = [
{
label: _Names.itemCode,
@@ -2834,7 +2314,7 @@ export const InventoryBalanceActive = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@@ -2852,12 +2332,11 @@ export const InventoryBalanceActive = [
{ label: "备注", prop: "remark" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "供应商批次", prop: "supplierBatch" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
{ label: "最后事务编号", prop: 'lastTransNumber' },
]
-// 库存事务 20230410
+// 库存事务
export const InventoryTransaction = [
{
label: "事务编号",
@@ -2877,7 +2356,7 @@ export const InventoryTransaction = [
{ label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
{ label: "事务数量", prop: "qty",isNumber:true },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "到货单位", prop: "uom" },
@@ -2898,8 +2377,8 @@ export const InventoryTransaction = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
]
+
// 库存快照
export const InventorySnapshot = [
{
@@ -2911,7 +2390,8 @@ export const InventorySnapshot = [
},
{ label: "备注", prop: 'remark', },
]
-// 库存转移日志 20230410
+
+// 库存转移日志
export const InventoryTransferLog = [
{
label: "库存转移编号",
@@ -2944,13 +2424,12 @@ export const InventoryTransferLog = [
{ label: "到排序批次", prop: 'toLot' },
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "从箱码", prop: "fromPackingCode" },
- { label: "从仓库代码", prop: "fromWarehouseCode" },
{ label: "从库位组", prop: "fromLocationGroup" },
{ label: "到库位组", prop: 'toLocationGroup' },
{ label: "从库区", prop: "fromLocationArea" },
{ label: "到库区", prop: "toLocationArea" },
- { label: "从ERP库位", prop: "fromLocationErpCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.fromErpCode, prop: "fromLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -2959,9 +2438,9 @@ export const InventoryTransferLog = [
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "事务时间", prop: "transferTime",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
- { label: "到仓库代码", prop: "toWarehouseCode" },
]
-// 预计入库存(+自定义tab页) 20230411
+
+// 预计入库存(+自定义tab页)
export const expectOut = [
{
label: "任务编号",
@@ -2984,21 +2463,16 @@ export const expectOut = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "批次", prop: "lot" },
{ label: "到货日期", prop: "arriveDate",type:"dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "序号", prop: "serialNumber" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 预计入库存(+自定义tab页) 20230411
+
+// 预计入库存(+自定义tab页)
export const expectIn = [
{
label: "任务编号",
@@ -3020,20 +2494,14 @@ export const expectIn = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "序号", prop: 'serialNumber' },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
// 物品安全库存预警
@@ -3050,8 +2518,6 @@ export const safetyStockWarning = [
{ label: "最小库存", prop: 'minStock' },
{ label: "最大库存", prop: 'maxStock' },
{ label: "安全库存", prop: 'safetyStock' },
- // { label: "安全库存状态", prop: 'safetyStockStatus' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "存储关系代码", prop: "storeValue" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
]
@@ -3092,7 +2558,7 @@ export const splitPackingList = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 非生产领料申请 20230417
+// 非生产领料申请
export const pickingRequest = [
{
label: "领料单号",
@@ -3112,18 +2578,9 @@ export const pickingRequest = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 非生产领料审批 20230417
+
+// 非生产领料审批
export const pickingApproval = [
{
label: "领料单号",
@@ -3143,18 +2600,9 @@ export const pickingApproval = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 非生产领料任务 20240109
+
+// 非生产领料任务
export const pickingJob = [
{
label: "任务编号",
@@ -3163,12 +2611,8 @@ export const pickingJob = [
type: "name",
width: orderWidth
},
- // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedIssueRequestNumber" },
- // { label: "上游任务编号", prop: "upStreamJobNumber" },
- // { label: "优先级", prop: 'priority',},
- // { label: "优先级增量", prop: 'priorityIncrement',},
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@@ -3177,14 +2621,11 @@ export const pickingJob = [
{ label: "部门名称", prop: "deptName" },
{ 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: 'jobDescription' },
- // { label: "备注", prop: 'remark' },
]
-// 非生产领料记录 20230417
+
+// 非生产领料记录
export const pickingNote = [
{
label: "领料记录单号",
@@ -3204,13 +2645,9 @@ export const pickingNote = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 非生产退料申请 20230417
+
+// 非生产退料申请
export const materialReturnRequest = [
{
label: "退料单号",
@@ -3230,18 +2667,9 @@ export const materialReturnRequest = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 非生产退料审批 20230417
+
+// 非生产退料审批
export const materialReturnApproval = [
{
label: "退料单号",
@@ -3260,19 +2688,10 @@ export const materialReturnApproval = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
- { label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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' },
]
-// 非生产退料任务 20240109
+
+// 非生产退料任务
export const materialReturnJob = [
{
label: "任务编号",
@@ -3281,12 +2700,8 @@ export const materialReturnJob = [
type: "name",
width: orderWidth
},
- // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedReceiptRequestNumber" },
- // { label: "上游任务编号", prop: "upStreamJobNumber" },
- // { label: "优先级", prop: 'priority',},
- // { label: "优先级增量", prop: 'priorityIncrement',},
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@@ -3295,14 +2710,11 @@ export const materialReturnJob = [
{ label: "部门名称", prop: "deptName" },
{ 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: 'jobDescription' },
- // { label: "备注", prop: 'remark' },
]
-// 非生产退料记录 20230417
+
+// 非生产退料记录
export const materialReturnNote = [
{
label: "退料记录单号",
@@ -3322,13 +2734,9 @@ export const materialReturnNote = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 回收料收货记录 20230415
+
+// 回收料收货记录
export const recycledMaterialsReceipt = [
{
label: "回收料收货记录单号",
@@ -3342,13 +2750,9 @@ export const recycledMaterialsReceipt = [
{ label: "操作员", prop: "worker" },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 回收料调整申请 20230415
+
+// 回收料调整申请
export const recycledMaterialsAdjustmentApply = [
{
label: "回收料调整申请单号",
@@ -3363,18 +2767,9 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { 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: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 回收料调整记录 20230415
+
+// 回收料调整记录
export const materialsAdjustment = [
{
label: "回收料调整记录单号",
@@ -3390,14 +2785,9 @@ export const materialsAdjustment = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "任务单号", prop: "jobNumber" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "type", prop: 'type' },
- // { label: "创建者ID", prop: 'creatorId' },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨申请 20230417
+
+// 线边仓调拨申请
export const lineSideWarehouseAllocationRequest = [
{
label: "调拨申请单号",
@@ -3413,16 +2803,9 @@ export const lineSideWarehouseAllocationRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "调拨类型", prop: 'type' },
- // { 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"},
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨确认 20230417
+
+// 线边仓调拨确认
export const lineSideWarehouseAllocationConfirm = [
{
label: "调拨确认单号",
@@ -3440,15 +2823,9 @@ export const lineSideWarehouseAllocationConfirm = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨记录 20230417
+
+// 线边仓调拨记录
export const lineSideWarehouseAllocationNote = [
{
label: "调拨确认单号",
@@ -3467,14 +2844,9 @@ export const lineSideWarehouseAllocationNote = [
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 储位调拨记录 20230417
+
+// 储位调拨记录
export const interStorageAllocationNote = [
{
label: "调拨单号",
@@ -3490,17 +2862,9 @@ export const interStorageAllocationNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "任务ID", prop: 'jobNumber',width: orderWidth },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "调拨类型", prop: 'type' },
- // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
- // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨申请 20230410
+
+// 客户储位调拨申请
export const customerStorageAllocationRequest = [
{
label: "调拨申请单号",
@@ -3516,16 +2880,9 @@ export const customerStorageAllocationRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "调拨类型", prop: 'type' },
- // { 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"},
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨确认 20230410
+
+// 客户储位调拨确认
export const customerStorageAllocationConfirm = [
{
label: "调拨确认单号",
@@ -3544,14 +2901,9 @@ export const customerStorageAllocationConfirm = [
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨记录 20230410
+
+// 客户储位调拨记录
export const customerStorageAllocationNote = [
{
label: "调拨确认单号",
@@ -3570,14 +2922,9 @@ export const customerStorageAllocationNote = [
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
{ label: "使用中间库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 储位内移库记录 20230410
+
+// 储位内移库记录
export const intraStorageTransferNote = [
{
label: "移库单号",
@@ -3594,16 +2941,9 @@ export const intraStorageTransferNote = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "type", prop: 'type' },
- // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
- // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
]
-// 线边仓调整申请 20230417
+
+// 线边仓调整申请
export const lineSideWarehouseAdjustmentSheetRequest = [
{
label: "申请单号",
@@ -3618,19 +2958,9 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { 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: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调整记录 20230417
+
+// 线边仓调整记录
export const lineSideWarehouseAdjustmentSheetNote = [
{
label: "记录单号",
@@ -3646,16 +2976,9 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "调整单号", prop: "requestNumber",width: orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: 'jobNumber',width: orderWidth },
- // ************** 确认隐藏 ************************
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "类型", prop: 'type' },
- // { label: "是否确认", prop: "confirmed", type: "tagFilter", filters: "whetherOrNot" },
- // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
- // ************** 确认隐藏 ************************
]
-// 盘点计划 20230415
+
+// 盘点计划
export const CountPlan = [
{
label: "盘点计划单号",
@@ -3668,7 +2991,6 @@ export const CountPlan = [
{ label: "开始时间", prop: "beginTime",type: "dateTime" },
{ label: "结束时间", prop: "endTime", type: "dateTime" },
{ label: "计划时间", prop: 'planTime', type: "dateTime"},
- // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
{ label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" },
{ label: "盘点次数", prop: "inventoryStage" },
{ label: "盘点库位", prop: 'jsonLocationCodes',type:"showDetail",isJson:true,showProp:true },
@@ -3680,21 +3002,9 @@ export const CountPlan = [
{ label: "类型", prop: "type",type: "filter", filters: "checkType" },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
- // { label: "ERP料号JSON", prop: 'jsonItemCodes' },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { 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: "事务ID", prop: "tenantId" },
- // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
- // ************** 确认隐藏 ************************
]
-// 新增盘点计划-选择库位 20230328
+
+// 新增盘点计划-选择库位
export const CountPlanByAddLocation = [
{
label: "库位代码",
@@ -3703,7 +3013,6 @@ export const CountPlanByAddLocation = [
prop: "code"
},
{ label: "库位名称", prop: "name", showProp:true },
- { label: "仓库代码", prop: "warehouseCode", showProp:true },
{ label: "区域代码", prop: "areaCode", showProp:true },
{ label: "库位组代码", prop: "locationGroupCode", showProp:true },
{ label: "工作组代码", prop: "workGroupCode", showProp:true },
@@ -3734,15 +3043,9 @@ export const CountPlanByAddLocation = [
{ label: "描述", prop: "description", showProp:true },
{ label: "创建时间", prop: "creationTime", type: "dateTime", showProp:true },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime", showProp:true },
- // {
- // label: "操作",
- // type:"buttonOperation",
- // buttonText:'编辑|删除',
- // buttonName:'edit|delete',
- // fixed: "right"
- // },
]
-// 盘点任务 20230415
+
+// 盘点任务
export const CountJob = [
{
label: "任务编号",
@@ -3773,16 +3076,6 @@ export const CountJob = [
{ label: "描述", prop: "description" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组代码", prop: "workGroupCode" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "承接者ID", prop: "acceptUserId" },
- // { label: "完成者ID", prop: "completeUserId" },
- // { label: "上次修改者Id", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "是否自动完成", prop: 'isAutoComplete', type: "filter", filters: "whetherOrNot"},
- // ************** 确认隐藏 ************************
]
// 盘点任务-扫描明细
@@ -3801,7 +3094,7 @@ export const countJobDepDetails = [
{ label: "批次", prop: "lot" },
{ label: "库存库位", prop: "inventoryLocationCode" },
{ label: "库位代码", prop: "locationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
{ label: "供应商批次", prop: "supplierBatch" },
@@ -3811,12 +3104,11 @@ export const countJobDepDetails = [
{ label: "到货日期", prop: "arriveDate",type: "dateTime" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "过期时间", prop: "expireDate",type: "dateTime" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
]
-// 盘点记录 20230415
+// 盘点记录
export const CountNote = [
{
label: "盘点记录单号",
@@ -3837,14 +3129,9 @@ export const CountNote = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
{ label: "描述", prop: "description" },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
]
-// 盘点调整申请 20230415
+
+// 盘点调整申请
export const CountPlanAdjust = [
{
label: "盘点调整申请单号",
@@ -3861,19 +3148,9 @@ export const CountPlanAdjust = [
{ label: "备注", prop: 'remark' },
{ label: "生效时间", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- // ************** 确认隐藏 ************************
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "创建者ID", prop: "creatorId"},
- // { label: "ID", prop: 'id' },
- // { 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" },
- // ************** 确认隐藏 ************************
]
-// 盘点调整记录 20230415
+
+// 盘点调整记录
export const CountAdjustNote = [
{
label: "盘点调整单号",
@@ -3890,17 +3167,11 @@ export const CountAdjustNote = [
{ label: "备注", prop: "remark" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
{ label: "生效时间", prop: "activeDate", type: "dateTime" },
- // ************** 确认隐藏 ************************
- // { label: "事务ID", prop: "tenantId" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // { label: "isAdjusted", prop: 'isAdjusted' },
- // ************** 确认隐藏 ************************
]
// 消息管理
/**/
-// 消息类型 20230414
+// 消息类型
export const MessageType = [
{
label: "消息类别代码",
@@ -3917,11 +3188,6 @@ export const MessageType = [
{ label: "消息使用的短信模板名称", prop: "smsTemplate" },
{ label: "是否发送邮件", prop: "isSendEmail", type: "filter", filters: "whetherOrNot" },
{ label: "是否发送短信", prop: "isSendSms", type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "事务ID", prop: "tenantId" },
- // { label: "上次修改者", prop: "lastModifierId" },
- // { label: "创建者ID", prop: "creatorId" },
- // ************** 确认隐藏 ************************
]
// 系统权限管理
@@ -3963,12 +3229,6 @@ export const dataExchangeFromOut = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// 归档外部数据转换
@@ -3995,12 +3255,6 @@ export const dataExchangeFromOut_file = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// WMS数据接收
@@ -4019,12 +3273,6 @@ export const comingToWms = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// 归档WMS数据接收
@@ -4043,12 +3291,6 @@ export const comingToWms_file = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// WMS数据转换
@@ -4068,12 +3310,6 @@ export const dataExchangeFromWms = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// 归档WMS数据转换
@@ -4093,15 +3329,8 @@ export const dataExchangeFromWms_file = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
-
// 外部数据接收
export const comingFromOut = [
{ label: _Dashboard.number, prop: "number" },
@@ -4126,12 +3355,6 @@ export const comingFromOut = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// 归档外部数据接收
@@ -4158,12 +3381,6 @@ export const comingFromOut_file = [
{ label: _Dashboard.errorCode, prop: "errorCode" },
{ label: _Dashboard.errorMessage, prop: "errorMessage", type:"showDetail",showProp:true },
{ label: _Dashboard.retryTimes, prop: "retryTimes" },
-// ************** 暂时隐藏 ************************
- // { label: _Public.creationTime, prop: "creationTime",type:'dateTime' },
- // { label: _Public.creatorId, prop: "creatorId" },
- // { label: _Public.lastModificationTime", prop: "lastModificationTime",type:'dateTime' },
- // { label: _Public.lastModifierId, prop: "lastModifierId" },
- // { label: _Public.id, prop: "ID" },
]
// exchangeData批量操作页面
@@ -4185,28 +3402,6 @@ export const exchangeDataMaintenancePage = [
{ label: _Names.tenantId, prop: "tenantId" },
]
-// 位置码
-export const PositionCode = [
- {
- label: '位置码',
- prop: "code",
- fixed: "left",
- type: "name"
- },
- { label: "位置码类型", prop: 'type', type: "filter", filters: "positionCodeType" },
- { label: _Names.itemCode, prop: "partCode" },
- { label: _Names.itemName, prop: "partName" },
- { label: _Names.itemDesc1, prop: "partDesc" },
- // { label: _Names.itemDesc2, prop: "desc2" },
- { label: _Names.basicUom, prop: "basicUom" },
- { label: "箱数/数量", prop: "stdPackQty",isNumber:true },
- { label: "目标库位代码", prop: "locationCode" },
- { label: "目标库位名称", prop: "locationName" },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- { label: _Public.remark, prop: "remark" },
-]
-
// 器具
export const Utensil = [
{
@@ -4215,7 +3410,6 @@ export const Utensil = [
fixed: "left",
type: "name"
},
- // { label: _Names.stdPackQty, prop: "stdQty",isNumber:true },
{ label: "器具类型", prop: 'type',type:"filter",filters:"utensilType" },
{ label: "器具规格", prop: "model",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@@ -4335,6 +3529,7 @@ export const completDumpNoteZP = [
// { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "planStatus_ZS",width:"auto" },
// { label: "计划日期", prop: 'planTime', type: "dateTime",width:"auto"},
// ]
+
// 注塑申请
export const IssueRequestZS = [
{ label: "请求单号", prop: "number", fixed: "left", type: "name" },
@@ -4342,12 +3537,13 @@ export const IssueRequestZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 注塑任务
export const IssueJobZS = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -4367,6 +3563,7 @@ export const IssueJobZS = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 注塑记录
export const IssueNoteZS = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -4391,12 +3588,13 @@ export const IssueRequestPT = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂任务
export const IssueJobPT = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -4416,6 +3614,7 @@ export const IssueJobPT = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂记录
export const IssueNotePT = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -4440,12 +3639,13 @@ export const IssueRequestZP = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配任务
export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -4465,6 +3665,7 @@ export const IssueJobZP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配记录
export const IssueNoteZP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -4489,12 +3690,13 @@ export const IssueRequestBP = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品任务
export const IssueJobBP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -4514,6 +3716,7 @@ export const IssueJobBP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品记录
export const IssueNoteBP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -4535,16 +3738,13 @@ export const IssueNoteBP = [
export const transferLibRequest = [
{ label: "申请编号", prop: "number",type:"name",fixed: "left", },
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
+
// 业务库移任务
export const transferLibJob = [
{ label: "任务编号", prop: "number",type:"name",fixed: "left", },
@@ -4552,16 +3752,13 @@ export const transferLibJob = [
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
+
// 业务库移记录
export const transferLibNote = [
{ label: "记录编号", prop: "number",type:"name",fixed: "left", },
@@ -4569,10 +3766,6 @@ export const transferLibNote = [
{ label: "任务单号", prop: 'jobNumber' },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: 'remark' },
@@ -4588,12 +3781,13 @@ export const ThirdLocationRequest = [
{ label: "操作员", prop: 'worker' },
{ label: "生产线", prop: 'prodLine' },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { 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" },
]
+
// 三方库任务
export const ThirdLocationJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -4618,6 +3812,7 @@ export const ThirdLocationJob = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 三方库记录
export const ThirdLocationNote = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -4727,7 +3922,7 @@ export const KittingIssueRequest = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -4780,7 +3975,6 @@ export const isPadForTransferLibJob = [
{ label: "回调业务类型", prop: "callBusinessType" },
{ label: "传入申请单号", prop: "callRequestNumber" },
{ label: "传入任务单号", prop: "callJobNumber" },
- // { label: "任务类型", prop: 'jobType' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
@@ -4795,7 +3989,6 @@ export const isPadForTransferLibJob = [
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
-
// 字段说明
// showProp: true //隐藏该字段的高级筛选+列表排序
// sortable: false //隐藏该字段的列表排序
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index f0c99462c..0b90ebbce 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -4,43 +4,33 @@ let _Names = zh.ColumsNames // 业务字段
// 基础信息数据管理
/**/
-// 物品基础信息 20230328
+// 物品基础信息
export const ItemBasic = [
- { label: _Names.itemCode, prop: 'code' },
- { label: "物品名称", prop: "name" },
- { label: "物品描述1", prop: "desc1" },
- { label: "物品描述2", prop: "desc2" },
- { label: "配置", prop: 'configuration' },
- { label: "计量单位", prop: 'basicUom' },
- { label: "种类", prop: 'category' },
- { label: "状态", prop: "status", type: "filter", filters: "itemStatus" },
- { label: "类型", prop: 'type', type: "filter", filters: "ItemTypeBasic" },
- { label: "制造件", prop: "canMake", type: "filter", filters: "whetherOrNot" },
- { label: "采购件", prop: "canBuy", type: "filter", filters: "whetherOrNot" },
- { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
- { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
- { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "标包数", prop: "stdPackQty" },
- { label: "有效期", prop: "validity" },
- { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
- { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
- { label: "备注", prop: 'remark' },
- // { label: "分组", prop: 'group' },
- // { label: "颜色", prop: 'color' },
- // { label: "项目", prop: 'project' },
- // { label: "版本", prop: 'version' },
- // { label: "工程变革", prop: 'eco' },
- // { label: "Elevel", prop: 'elevel' },
- // { label: "事务ID", prop: "tenantId" },
- // { label: "创建者ID", prop: "creatorId" },
- // { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
-]
-// 物品质量信息 20230328
+ { label: _Names.itemCode, prop: "code" },
+ { label: _Names.itemName, prop: "name" },
+ { label: _Names.itemDesc1, prop: "desc1" },
+ { label: _Names.itemDesc2, prop: "desc2" },
+ { label: _Names.configuration, prop: "configuration" },
+ { label: _Names.basicUom, prop: "basicUom" },
+ { label: _Names.category, prop: "category" },
+ { label: _Public.status, prop: "status", type: "filter", filters: "itemStatus" },
+ { label: _Public.type, prop: 'type', type: "filter", filters: "ItemTypeBasic" },
+ { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
+ { label: _Names.canMake, prop: 'canMake', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.canBuy, prop: 'canBuy', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.canOutsourcing, prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.isRecycled, prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.isPhantom, prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+ { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
+ { label: _Names.validity, prop: "validity" },
+ { label: _Names.validityUnit, prop: "validityUnit", type: "filter", filters: "validityUnit" },
+ { label: _Names.manageType, prop: "manageType", type: "filter", filters: "manageType" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+]
+
+// 物品质量信息
export const ItemQuality = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
@@ -49,212 +39,179 @@ export const ItemQuality = [
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
- { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
- { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" },
- { label: "描述", prop: "description" },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" },
+ { label: _Names.inspectType, prop: 'inspectType', type: "filter", filters: "inspectType" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.description, prop: "description" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
+
]
-// 物品分类信息 20230328
+
+// 物品分类信息
export const ItemCategory = [
- { label: _Names.itemCode, prop: 'itemCode' },
- { label: "分类代码", prop: "categoryCode" },
- { label: "分类值", prop: "value" },
- { label: "备注", prop: 'remark' },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Names.itemCode, prop: "itemCode" },
+ { label: _Names.categoryCode, prop: 'categoryCode' },
+ { label: _Names.categoryValue, prop: 'value' },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 物品包装信息 20230328
+
+// 物品包装信息
export const ItemPack = [
- { label: "包装代码", prop: 'packCode' },
- { label: "包装名称", prop: "packName" },
+ {
+ label: _Names.itemCode,
+ prop: "itemCode",
+ fixed: "left",
+ type: "name"
+ },
+ { label: _Names.itemName, prop: "item_nameFromFE" },
+ { label: _Names.itemDesc1, prop: "item_desc1FromFE" },
+ { label: _Names.itemDesc2, prop: "item_desc2FromFE" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
+ { label: _Names.supplierCode, prop: 'supplierCode' },
+ { label: _Names.supplierName, prop: 'supplierName' },
+ { label: _Names.packCode, prop: "packCode", },
+ { label: _Names.packName, prop: "packName" },
+ { label: _Names.packType, prop: "packType" },
+ { label: _Names.packBasicUom, prop: "basicUom" },
+ { label: _Names.packQty, prop: "qty",isNumber:true },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type:'dateTime' },
+]
+
+// 物品质检标准信息
+export const AQL = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
- { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
- { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
- { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemName, prop: "item_nameFromFE" },
+ { label: _Names.itemDesc1, prop: "item_desc1FromFE" },
+ { label: _Names.itemDesc2, prop: "item_desc2FromFE" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: _Names.supplierCode, prop: 'supplierCode' },
{ label: _Names.supplierName, prop: 'supplierName' },
- { label: '包装计量单位', prop: "basicUom" },
- { label: '包装数量', prop: "qty" },
- { label: "事务ID", prop: "tenantId" },
- { label: '包装类型', prop: "packType" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "备注", prop: 'remark', colSpan: 12 },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
+ { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true },
+ { label: _Names.floorQty, prop: "floorQty",isNumber:true},
+ { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
+ { label: _Names.samplePercent, prop: 'samplePercent' },
+ { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type:'dateTime' },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type:'dateTime' },
+]
+// 位置码
+export const PositionCode = [
+ { label: '位置码', prop: "code" },
+ { label: "位置码类型", prop: 'type', type: "filter", filters: "positionCodeType" },
+ { label: _Names.itemCode, prop: "partCode" },
+ { label: _Names.itemName, prop: "partName" },
+ { label: _Names.itemDesc1, prop: "partDesc" },
+ { label: _Names.basicUom, prop: "basicUom" },
+ { label: "箱数/数量", prop: "stdPackQty" },
+ { label: "目标库位代码", prop: "locationCode" },
+ { label: "目标库位名称", prop: "locationName" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 收容数标包
+
+// 半成品/成品收容数
export const ItemContainer = [
- { label: "收容代码", prop: 'containerCode' },
+ { label: "收容代码", prop: "containerCode" },
{ label: "收容代码描述", prop: "containerName" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "item_nameFromFE" },
- { label: "物品描述1", prop: "item_desc1FromFE" },
- { label: "物品描述2", prop: "item_desc2FromFE" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "item_nameFromFE" },
+ { label: _Names.itemDesc1, prop: "item_desc1FromFE" },
+ { label: _Names.itemDesc2, prop: "item_desc2FromFE" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: '转储标包数量', prop: "qty" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "备注", prop: 'remark', colSpan: 12 },
-]
-// 物品质检标准信息 20230328
-export const AQL = [
- { label: _Names.itemCode, prop: "itemCode" },
- { label: _Names.itemName, prop: "item_nameFromFE",showProp:true },
- { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
- { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
- { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
- { label: _Names.supplierCode, prop: 'supplierCode' },
- { label: _Names.supplierName, prop: 'supplierName' },
- { label: "数量上限", prop: 'ceilingQty' },
- { label: "数量下限", prop: "floorQty" },
- { label: "使用百分比", prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" },
- { label: "抽检百分比", prop: 'samplePercent' },
- { label: "抽检数量", prop: 'sampleQty' },
- { label: "ABC类", prop: 'abcClass',type: "filter", filters: "abcClass" },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "备注", prop: "remark" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 物品清单信息 20230328
+
+// 物品清单信息
export const Bom = [
- { label: "父物品号", prop: "product" },
- { label: _Names.productName, prop: "productName",showProp:true },
- { label: _Names.productDesc1, prop: "productDesc1",showProp:true },
- { label: "子物品号", prop: 'component' },
- { label: _Names.componentName, prop: "componentName",showProp:true },
- { label: _Names.componentDesc1, prop: "componentDesc1",showProp:true },
- { label: "子物品用量", prop: 'componentQty' },
- { label: "子物品用量单位", prop: 'componentUom' },
- { label: "开始时间", prop: "beginTime",type: "dateTime" },
- { label: "结束时间", prop: "endTime", type: "dateTime" },
- { label: "ERP工序", prop: "erpOp" },
- { label: "制造工序", prop: "mfgOp" },
- { label: "层级", prop: "layer" },
- { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" },
- { label: "取整方式", prop: "truncType", type: "filter", filters: "truncType" },
- { label: "计划拆分规则", prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Names.productCode, prop: "product" },
+ { label: _Names.productName, prop: "productName" },
+ { label: _Names.productDesc1, prop: "productDesc1" },
+ { label: _Names.componentCode, prop: "component" },
+ { label: _Names.componentName, prop: "componentName" },
+ { label: _Names.componentDesc1, prop: "componentDesc1" },
+ { label: _Names.componentQty, prop: 'componentQty',isNumber:true },
+ { label: _Names.layer, prop: "layer" },
+ { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+ { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+ { label: _Public.remark, prop: 'remark' },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: 'lastModificationTime', type: "dateTime" },
]
-// 客户信息 20230328
+
+// 客户信息
export const Customer = [
- { label: "客户代码", prop: "code" },
- { label: "客户名称", prop: 'name' },
- { label: "国家", prop: "country" },
- { label: "城市", prop: "city" },
- { label: "地址", prop: "address" },
- { label: "联系人", prop: "contacts" },
- { label: "电话", prop: "phone" },
- { label: "传真", prop: "fax" },
- { label: "邮编", prop: "postID" },
- { label: "货币", prop: "currency" },
- { label: "备注", prop: 'remark' },
- { label: "简称", prop: "shortName" },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "状态", prop: "isActive", type: "filter",filters: "openToCloseBit" },
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
+ { label: _Names.customerCode, prop: "code" },
+ { label: _Names.customerName, prop: "name" },
+ { label: _Names.customerShortName, prop: "shortName" },
+ { label: _Names.address, prop: "address" },
+ { label: _Names.contact, prop: "contacts" },
+ { label: _Names.phone, prop: "phone" },
+ { label: _Names.fax, prop: "fax" },
+ { label: _Names.postID, prop: "postID" },
+ { label: _Names.country, prop: "country" },
+ { label: _Names.city, prop: "city" },
+ { label: _Names.currency, prop: "currency" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 客户物品信息 20230328
+
+// 客户物品信息
export const CustomerItem = [
- { label: "客户代码", prop: 'customerCode' },
+ { label: _Names.customerCode, prop: "customerCode" },
+ { label: _Names.customerItemCode, prop: "customerItemCode" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "客户物品代码", prop: "customerItemCode" },
- { label: "版本", prop: "version" },
- { label: "开始时间", prop: "beginTime", type: "dateTime" },
- { label: "结束时间", prop: "endTime" ,type: "dateTime" },
- { label: "备注", prop: 'remark' },
- { label: "客户包装数量", prop: "customerPackQty" },
- { label: "客户包装数量单位", prop: "customerPackUom" },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "版本", prop: 'version' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
-]
-// 客户地址信息 20230328
-export const CustomerAddress = [
- { label: "客户地址编号", prop: "code" },
- { label: "客户地址名称", prop: 'name' },
- { label: "客户代码", prop: 'customerCode' },
- { label: "库位代码", prop: 'locationCode' },
- { label: "城市", prop: "city" },
- { label: "地址", prop: "address" },
- { label: "联系人", prop: "contact" },
- { label: "描述", prop: "desc" },
- { label: "备注", prop: 'remark' },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: "warehouseCode", },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Names.customerPackQty, prop: "customerPackQty",isNumber:true },
+ { label: _Names.customerPackUom, prop: "customerPackUom" },
+ { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+ { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+ { label: _Public.remark, prop: 'remark' },
+ { label: _Names.version, prop: 'version' },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 客户项目信息 20230328
+
+// 客户地址信息
+export const CustomerAddress = [
+ { label: _Names.customerCode, prop: "customerCode" },
+ { label: _Names.customerAdrCode, prop: "code" },
+ { label: _Names.customerAdrName, prop: "name" },
+ { label: _Names.locationCode, prop: "locationCode" },
+ { label: _Names.city, prop: "city" },
+ { label: _Names.address, prop: "address" },
+ { label: _Names.contact, prop: "contact" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.description, prop: "desc" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime" },
+]
+
+// 客户项目信息
export const Project = [
- { label: "客户代码", prop: "customerCode" },
- { label: "项目代码", prop: "code" },
- { label: "项目名称", prop: 'name' },
- { label: "开始时间", prop: "beginTime", type: "dateTime" },
- { label: "结束时间", prop: "endTime", type: "dateTime" },
- { label: "描述", prop: "description" },
- { label: "备注", prop: 'remark' },
- { label: "事务ID", prop: "tenantId" },
- { label: "创建时间", prop: "creationTime", type:'dateTime' },
- { label: "创建者ID", prop: "creatorId" },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
- { label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
+ { label: _Names.projectCode, prop: "code" },
+ { label: _Names.projectName, prop: "name" },
+ { label: _Names.customerCode, prop: "customerCode" },
+ { label: _Public.beginTime, prop: "beginTime", type: "dateTime" },
+ { label: _Public.endTime, prop: "endTime", type: "dateTime" },
+ { label: _Public.remark, prop: "remark" },
+ { label: _Public.description, prop: "description" },
+ { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
+ { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
-// 供应商信息 20230328
+
+// 供应商信息
export const Supplier = [
{ label: "供应商代码", prop: "code" },
{ label: "供应商名称", prop: "name" },
@@ -277,11 +234,9 @@ export const Supplier = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 供应商物品信息 20230328
+
+// 供应商物品信息
export const SupplierItem = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -297,11 +252,9 @@ export const SupplierItem = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 供应商时间窗口 20230328
+
+// 供应商时间窗口
export const SupplierTimeWindow = [
{ label: "供应商代码", prop: 'supplierCode' },
{ label: "供应商名称", prop: 'supplierName' },
@@ -313,11 +266,9 @@ export const SupplierTimeWindow = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 收货口信息 20230328
+
+// 收货口信息
export const Dock = [
{ label: "默认库位代码", prop: "defaultLocationCode" },
{ label: "收货口代码", prop: "code" },
@@ -329,12 +280,9 @@ export const Dock = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 区域信息 20230328
+
+// 区域信息
export const Area = [
{ label: "区域代码", prop: "code" },
{ label: "区域名称", prop: 'name' },
@@ -347,12 +295,9 @@ export const Area = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库位组信息 20230328
+
+// 库位组信息
export const LocationGroup = [
{ label: "区域代码", prop: "areaCode" },
{ label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" },
@@ -369,7 +314,6 @@ export const LocationGroup = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" },
{ label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" },
{ label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" },
@@ -386,27 +330,22 @@ export const LocationGroup = [
{ label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" },
{ label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" },
{ label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 工作组信息 20230328
+
+// 工作组信息
export const WorkGroup = [
{ label: "工作组代码", prop: "code" },
{ label: "工作组名称", prop: 'name' },
{ label: "描述", prop: "description" },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "创建时间", prop: "creationTime", type:'dateTime' },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库位信息 20230328
+
+// 库位信息
export const Location = [
{ label: "库位代码", prop: "code" },
{ label: "库位名称", prop: "name" },
@@ -444,12 +383,9 @@ export const Location = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库位零件关系 20230331
+
+// 库位零件关系
export const ItemStoreRelation = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
@@ -469,12 +405,9 @@ export const ItemStoreRelation = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库位可用容量信息 20230331
+
+// 库位可用容量信息
export const InventoryLocationCapacity = [
{ label: "可用容量(%)", prop: "availableCapacity" },
{ label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" },
@@ -487,14 +420,11 @@ export const InventoryLocationCapacity = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 物品安全库存信息 20230328
+
+// 物品安全库存信息
export const ItemSafetyStock = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
{ label: "存储关系代码", prop: "storeValue" },
{ label: "最大库存", prop: "maxStock" },
@@ -509,11 +439,9 @@ export const ItemSafetyStock = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 事务类型信息 20230328
+
+// 事务类型信息
export const TransactionType = [
{ label: "事务类型", prop: "transType", type: "filter", filters: "TransTypeBase" },
{ label: "事务子类型", prop: "transSubType", type: "filter", filters: "transSubType" },
@@ -530,8 +458,6 @@ export const TransactionType = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "是否可用", prop: 'enabled', type: "filter", filters: "whetherOrNot" },
{ label: "描述", prop: 'description' },
- // { label: "入库库区列表", prop: 'inLocationAreas', type: "filterList", filters: "inventoryStage" },
- // { label: "出库库区列表", prop: 'outLocationAreas', type: "filterList", filters: "inventoryStage" },
{ label: "入库库区列表", prop: 'inLocationAreas' },
{ label: "出库库区列表", prop: 'outLocationAreas' },
{ label: "备注", prop: 'remark' },
@@ -540,10 +466,8 @@ export const TransactionType = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
+
// 库存开账
export const InventoryBilling = [
{ label: _Names.itemCode, prop: "itemCode", type: "name" },
@@ -556,7 +480,8 @@ export const InventoryBilling = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
]
-// 车间信息 20230328
+
+// 车间信息
export const Workshop = [
{ label: "车间代码", prop: "code" },
{ label: "车间名称", prop: 'name' },
@@ -567,11 +492,9 @@ export const Workshop = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 生产线信息 20230328
+
+// 生产线信息
export const ProductionLine = [
{ label: "生产线代码", prop: "code", fixed: "left", type: "name" },
{ label: "生产线名称", prop: 'name' },
@@ -581,7 +504,8 @@ export const ProductionLine = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 生产线零件关系 20230328
+
+// 生产线零件关系
export const ProductionLineItem = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -595,7 +519,8 @@ export const ProductionLineItem = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 工作中心信息 20230328
+
+// 工作中心信息
export const WorkCenter = [
{ label: "生产线代码", prop: "productionLineCode" },
{ label: "原料库位", prop: "rawLocation" },
@@ -610,11 +535,9 @@ export const WorkCenter = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 班组信息 20230328
+
+// 班组信息
export const Team = [
{ label: "班组代码", prop: "code" },
{ label: "班组名称", prop: 'name' },
@@ -626,11 +549,9 @@ export const Team = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 班次信息 20230328
+
+// 班次信息
export const Shift = [
{ label: "班次代码", prop: "code" },
{ label: "班次名称", prop: "name" },
@@ -644,11 +565,9 @@ export const Shift = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 作业指导书信息 20230328
+
+// 作业指导书信息
export const ItemGuideBook = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -662,11 +581,9 @@ export const ItemGuideBook = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 账期信息 20230328
+
+// 账期信息
export const accountPeriodNote = [
{ label: "名称", prop: "name" },
{ label: "启日", prop: "beginTime",type:'dateTime' },
@@ -682,11 +599,9 @@ export const accountPeriodNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 字典信息 20230328
+
+// 字典信息
export const Dict = [
{ label: "字典编号", prop: "code" },
{ label: "字典名称", prop: "name" },
@@ -697,11 +612,9 @@ export const Dict = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 分类信息 20230328
+
+// 分类信息
export const Category = [
{ label: "分类代码", prop: "code" },
{ label: "分类名称", prop: 'name' },
@@ -712,11 +625,9 @@ export const Category = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 计量单位信息 20230328
+
+// 计量单位信息
export const Uom = [
{ label: "计量单位编号", prop: "code" },
{ label: "计量单位名称", prop: 'name' },
@@ -728,11 +639,9 @@ export const Uom = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 日历信息 20230328
+
+// 日历信息
export const Calendar = [
{ label: "模块", prop: "module" },
{ label: "状态", prop: "status", type: "filter", filters: "calendarStatus" },
@@ -744,11 +653,9 @@ export const Calendar = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 配置信息 20230328 暂无接口
+
+// 配置信息
export const Configuration = [
{ label: "键", prop: "key" },
{ label: "值", prop: "value" },
@@ -759,11 +666,9 @@ export const Configuration = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者ID", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 文档信息 20230328
+
+// 文档信息
export const documentBasic = [
{ label: "编号", prop: "code" },
{ label: "名称", prop: "name" },
@@ -779,10 +684,8 @@ export const documentBasic = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: "remark" },
{ label: "描述", prop: "description" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
+
// 标准成本价格单
export const StdCostPriceSheet = [
{
@@ -801,6 +704,7 @@ export const StdCostPriceSheet = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
]
+
// 采购价格单
export const PurchasePriceSheet = [
{
@@ -821,6 +725,7 @@ export const PurchasePriceSheet = [
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: "remark" },
]
+
// 销售价格单
export const SalePriceSheet = [
{
@@ -843,7 +748,8 @@ export const SalePriceSheet = [
]
// 原料管理
-// 供应商发货通知 20230404
+/**/
+// 供应商发货通知
export const SupplierAsn = [
{ label: "发货单号", prop: "number" },
{ label: "订单号", prop: "poNumber" },
@@ -866,13 +772,9 @@ export const SupplierAsn = [
{ label: "时间窗口", prop: 'timeWindow' },
{ label: "筹措员代码", prop: 'planUserCode' },
{ label: "创建者ID", prop: 'creatorId' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "status", prop: 'status' },
- // { label: "createType", prop: 'createType' },
- // ************** 确认隐藏 ************************
]
-// 采购订单信息 20230404
+
+// 采购订单信息
export const PurchaseOrder = [
{ label: "采购订单号", prop: 'number' },
{ label: "供应商代码", prop: "supplierCode" },
@@ -896,10 +798,6 @@ export const PurchaseOrder = [
{ label: "截止日期", prop: 'dueDate',type: "dateTime" },
{ label: "版本", prop: 'version' },
{ label: "税率", prop: 'taxRate' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "orderStatus", prop: 'orderStatus' },
- // ************** 确认隐藏 ************************
]
// 采购订单信息 （有关闭订单行）
@@ -925,12 +823,9 @@ export const PurchaseOrderHigher = [
{ label: "截止日期", prop: 'dueDate',type: "dateTime" },
{ label: "版本", prop: 'version' },
{ label: "税率", prop: 'taxRate' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "orderStatus", prop: 'orderStatus' },
- // ************** 确认隐藏 ************************
]
-// 到货请求 已调整 20230404
+
+// 到货请求
export const PurchaseReceiptRequest = [
{ label: "到货单号", prop: "number" },
{ label: "订单号", prop: "poNumber" },
@@ -957,11 +852,9 @@ export const PurchaseReceiptRequest = [
{ label: "车牌号", prop: 'truckNumber' },
{ label: "收货口", prop: 'dockCode' },
{ label: "时间窗口", prop: 'timeWindow' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 采购收货任务 20230404
+
+// 采购收货任务
export const PurchaseReceiptJob = [
{ label: "收货任务编号", prop: "number" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
@@ -994,13 +887,9 @@ export const PurchaseReceiptJob = [
{ label: "完成者ID", prop: 'completeUserId' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "时间窗口", prop: 'timeWindow' },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: "type" },
- // ************** 确认隐藏 ************************
]
-// 采购收货记录 已调整 20230404
+
+// 采购收货记录
export const PurchaseReceiptNote = [
{ label: "收货单号", prop: 'number' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1020,13 +909,9 @@ export const PurchaseReceiptNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "任务代码", prop: 'jobNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 报检单 20230410
+
+// 报检单
export const InspectRequest = [
{ label: "检验单号", prop: "number" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1037,7 +922,6 @@ export const InspectRequest = [
{ label: "操作员", prop: 'worker' },
{ label: "备注", prop: 'remark' },
{ label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
@@ -1058,12 +942,9 @@ export const InspectRequest = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "检验单号", prop: 'inspectNumber' },
{ label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "nextAction", prop: 'nextAction' },
- // ************** 确认隐藏 ************************
]
-// 检验记录 20230407
+
+// 检验记录
export const InspectNote = [
{ label: "检验单号", prop: "number" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1082,11 +963,9 @@ export const InspectNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "检验规则", prop: 'nextAction',type: "filter", filters: "nextAction" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 不合格转合格记录 已调整 20230407
+
+// 不合格转合格记录
export const unqualifiedToQualifiedNote = [
{ label: "转合格单号", prop: "number" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -1097,11 +976,9 @@ export const unqualifiedToQualifiedNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 采购上架记录 20230410
+
+// 采购上架记录
export const PutawayNote = [
{ label: "上架记录单号", prop: 'number' },
{ label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
@@ -1121,12 +998,9 @@ export const PutawayNote = [
{ label: "发货单号", prop: 'asnNumber' },
{ label: "要货计划单号", prop: 'rpNumber' },
{ label: "完工收货单号", prop: 'productReceiptNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 人工叫料申请 20230411
+
+// 人工叫料申请
export const IssueRequest = [
{ label: "申请编号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -1147,12 +1021,9 @@ export const IssueRequest = [
{ label: "备料计划单号", prop: 'preparationPlanNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "叫料类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 人工发料任务 20230411
+
+// 人工发料任务
export const IssueJob = [
{ label: "发料任务编号", prop: "number" },
{ label: "申请单号", prop: "materialRequestNumber" },
@@ -1181,12 +1052,9 @@ export const IssueJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 人工发料记录 20230411
+
+// 人工发料记录
export const IssueNote = [
{ label: "发料记录单号", prop: "number" },
{ label: "申请单号", prop: 'requestNumber' },
@@ -1204,11 +1072,9 @@ export const IssueNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime', type: "dateTime" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 自动叫料申请 20230411
+
+// 自动叫料申请
export const automaticCallApply = [
{ label: "申请编号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -1229,12 +1095,9 @@ export const automaticCallApply = [
{ label: "备料计划单号", prop: 'preparationPlanNumber' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "叫料类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 自动发料任务 20230411
+
+// 自动发料任务
export const automaticCallJob = [
{ label: "发料任务编号", prop: "number" },
{ label: "申请单号", prop: "materialRequestNumber" },
@@ -1263,12 +1126,9 @@ export const automaticCallJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "生产线", prop: 'prodLine' },
{ label: "车间", prop: 'workshop' },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 自动发料记录 20230411
+
+// 自动发料记录
export const automaticCallNote = [
{ label: "发料记录单号", prop: "number" },
{ label: "申请单号", prop: 'requestNumber' },
@@ -1286,11 +1146,9 @@ export const automaticCallNote = [
{ label: "生效日期", prop: 'activeDate' },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 上架前退货记录 20230412
+
+// 上架前退货记录
export const beforeGroundingReturnNote = [
{ label: "退货单号", prop: "number" },
{ label: "发货单号", prop: "asnNumber" },
@@ -1308,13 +1166,9 @@ export const beforeGroundingReturnNote = [
{ label: "生效日期", prop: 'activeDate' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "returnType", prop: 'returnType' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货申请 20230412
+
+// 上架后退货申请
export const PurchaseReturnRequest = [
{ label: "退货申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
@@ -1336,12 +1190,9 @@ export const PurchaseReturnRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "收货单号", prop: 'rpNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "returnType", prop: 'returnType' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货审批 20240229
+
+// 上架后退货审批
export const PurchaseReturnApprove = [
{ label: "退货申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
@@ -1363,12 +1214,9 @@ export const PurchaseReturnApprove = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "收货单号", prop: 'rpNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "returnType", prop: 'returnType' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货任务 20230412
+
+// 上架后退货任务
export const PurchaseReturnJob = [
{ label: "退货任务单号", prop: "number" },
{ label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
@@ -1390,7 +1238,6 @@ export const PurchaseReturnJob = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "操作员", prop: 'worker' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "优先级", prop: 'priority' },
@@ -1401,11 +1248,9 @@ export const PurchaseReturnJob = [
{ label: "完成者ID", prop: 'completeUserId' },
{ label: "收货单号", prop: 'rpNumber' },
{ label: "任务描述", prop: 'jobDescription' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 上架后退货记录 20230412
+
+// 上架后退货记录
export const PurchaseReturnNote = [
{ label: "退货单号", prop: "number" },
{ label: "发货单号", prop: "asnNumber" },
@@ -1423,13 +1268,9 @@ export const PurchaseReturnNote = [
{ label: "生效日期", prop: 'activeDate' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "退货请求单号", prop: 'purchaseReturnRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "returnType", prop: 'returnType' },
- // { label: "status", prop: 'status' },
- // ************** 确认隐藏 ************************
]
-// 原料报废记录 20230412
+
+// 原料报废记录
export const ScrapNote = [
{ label: "报废记录单号", prop: "number" },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
@@ -1443,11 +1284,9 @@ export const ScrapNote = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 原料直发记录 20230412
+
+// 原料直发记录
export const materialDirectSendNote = [
{ label: "发货单号", prop: "number" },
{ label: "发货日期", prop: "deliverTime",type: "dateTime" },
@@ -1465,11 +1304,9 @@ export const materialDirectSendNote = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "发货申请单号", prop: 'deliverRequestNumber' },
{ label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 直接发料记录 20230413
+
+// 直接发料记录
export const directIssueNote = [
{ label: "发料记录单号", prop: "number" },
{ label: "申请单号", prop: 'requestNumber' },
@@ -1487,14 +1324,11 @@ export const directIssueNote = [
{ label: "生效日期", prop: 'activeDate' },
{ label: "车间", prop: 'workshop' },
{ label: "确认时间", prop: 'confirmTime' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
// 成品管理
/**/
-// 完工收货缴库申请 20230415
+// 完工收货缴库申请
export const ProductReceiptRequest = [
{ label: "缴库申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -1517,12 +1351,9 @@ export const ProductReceiptRequest = [
{ label: "班组", prop: 'team' },
{ label: "事务ID", prop: "tenantId" },
{ label: "计划日期", prop: 'planDate' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 完工收货缴库记录 20230413
+
+// 完工收货缴库记录
export const ProductReceiptNote = [
{ label: "缴库记录单号", prop: 'number' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
@@ -1538,13 +1369,9 @@ export const ProductReceiptNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "类型", prop: 'type' },
- // { label: "receiptType", prop: 'receiptType' },
- // ************** 确认隐藏 ************************
]
-// 完工收货报废申请 20230412
+
+// 完工收货报废申请
export const ProductReceiptScrapRequest = [
{ label: "报废申请单号", prop: 'number' },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -1562,11 +1389,9 @@ export const ProductReceiptScrapRequest = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "报废类型", prop: 'type' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 完工收货报废记录 20230412
+
+// 完工收货报废记录
export const ProductReceiptScrapNote = [
{ label: "报废记录单号", prop: "number" },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
@@ -1580,11 +1405,9 @@ export const ProductReceiptScrapNote = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 半成品上架记录 20230415
+
+// 半成品上架记录
export const partiallyPreparedProductsNote = [
{ label: "上架记录单号", prop: 'number' },
{ label: "到货单号", prop: 'purchaseReceiptRequestNumber' },
@@ -1603,12 +1426,9 @@ export const partiallyPreparedProductsNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 成品发货申请 20230414
+
+// 成品发货申请
export const DeliverRequest = [
{ label: "发货申请单号", prop: 'number' },
{ label: "状态",prop: "requestStatus", type: "filter", filters: "requestStatus" },
@@ -1629,11 +1449,9 @@ export const DeliverRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 成品发货任务 20230414
+
+// 成品发货任务
export const DeliverJob = [
{ label: "发货任务单号", prop: "number" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
@@ -1651,7 +1469,6 @@ export const DeliverJob = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1663,11 +1480,9 @@ export const DeliverJob = [
{ label: "任务描述", prop: 'jobDescription' },
{ label: "客户地址", prop: 'customerAddressCode' },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 成品发货记录 20230414
+
+// 成品发货记录
export const DeliverNote = [
{ label: "记录单号", prop: 'number' },
{ label: "发货任务单号", prop: "jobNumber" },
@@ -1686,14 +1501,11 @@ export const DeliverNote = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// FIS发货申请 20230414
+
+// FIS发货申请
export const FISDeliverRequest = [
{ label: "发货申请单号", prop: "number" },
- // { label: "状态", prop: "requestStatus", type: "filter", filters: "requestStatus" },
{ label: "发货时间", prop: "deliverTime", type: "dateTime" },
{ label: "客户代码", prop: "customerCode" },
{ label: "客户地址", prop: 'customerAddressCode' },
@@ -1711,10 +1523,8 @@ export const FISDeliverRequest = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
+
// 成品发运任务
export const FISDeliverJob = [
{ label: "发货申请单号", prop: "number" },
@@ -1736,11 +1546,9 @@ export const FISDeliverJob = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// FIS发货记录 20230415
+
+// FIS发货记录
export const FISDeliverNote = [
{ label: "记录单号", prop: 'number' },
{ label: "发货任务单号", prop: "jobNumber" },
@@ -1759,11 +1567,9 @@ export const FISDeliverNote = [
{ label: "发货计划单号", prop: 'deliverPlanNumber' },
{ label: "发货类型", prop: "deliverRequestType",type: "filter", filters: "deliverRequestType" },
{ label: "是否打印", prop: "countPrint",type: "filter", filters: "countPrintType" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 客户退拆申请 20230415
+
+// 客户退拆申请
export const customerDismantle = [
{ label: "退拆申请单号", prop: "number" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
@@ -1782,11 +1588,9 @@ export const customerDismantle = [
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 客户退拆任务 20230415
+
+// 客户退拆任务
export const customerDismantleJob = [
{
label: "退拆任务单号",
@@ -1805,14 +1609,14 @@ export const customerDismantleJob = [
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "优先级", prop: 'priority' },
{ label: "优先级增量", prop: 'priorityIncrement' },
{ label: "工作组", prop: 'workGroupCode' },
{ label: "车间", prop: 'workshop' },
{ label: "班次", prop: 'shift' },
]
-// 客户退拆记录 20230415
+
+// 客户退拆记录
export const customerDismantleNote = [
{ label: "退拆记录单号", prop: "number" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1828,7 +1632,8 @@ export const customerDismantleNote = [
{ label: "车间", prop: 'workshop' },
{ label: "申请单号", prop: 'requestNumber' },
]
-// 生产退库申请 20230415
+
+// 生产退库申请
export const productionReturnRequest = [
{ label: "退库申请单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
@@ -1845,11 +1650,9 @@ export const productionReturnRequest = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 生产退库任务 20230415
+
+// 生产退库任务
export const productionReturnJob = [
{ label: "退库任务单号", prop: "number" },
{ label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
@@ -1864,7 +1667,6 @@ export const productionReturnJob = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
- { label: "仓库代码", prop: 'warehouseCode' },
{ label: "上游任务编号", prop: 'upStreamJobNumber' },
{ label: "任务类型", prop: 'jobType' },
{ label: "优先级", prop: 'priority' },
@@ -1875,11 +1677,9 @@ export const productionReturnJob = [
{ label: "完成者ID", prop: 'completeUserId' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 生产退库记录 20230413
+
+// 生产退库记录
export const productionReturnNote = [
{ label: "退库记录单号", prop: "number" },
{ label: "退库单号", prop: "productionReturnRequestNumber" },
@@ -1893,14 +1693,11 @@ export const productionReturnNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "退料时间", prop: 'returnTime', type: "dateTime" },
{ label: "任务ID", prop: 'jobNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
// 标签管理
/**/
-// 标签查询 20230410
+// 标签查询
export const labelsList = [
{ label: "箱码", prop: "code" },
{ label: _Names.itemCode, prop: 'itemCode' },
@@ -1911,7 +1708,7 @@ export const labelsList = [
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
{ label: "库位", prop: "recommendLocationCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "类型", prop: "labelType", type: "filter", filters: "labelTypeStatus" },
{ label: "创建时间", prop: "creationTime",type:"dateTime" },
{ label: "创建者ID", prop: "creatorId" },
@@ -1940,19 +1737,14 @@ export const labelsList = [
{ label: "质量级别", prop: "qLevel" },
{ label: "质检文件", prop: "qualityFile" },
{ label: "器具号", prop: 'containerCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "labelStatus", prop: "labelStatus" },
- // ************** 确认隐藏 ************************
]
// 库存管理
/**/
-// 库存初始化记录 1
+// 库存初始化记录
export const InventoryInitialNote = [
{ label: "单据号", prop: "number" },
{ label: "操作员", prop: 'worker' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
{ label: "库存初始化请求单号", prop: "requestNumber" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
@@ -1962,7 +1754,8 @@ export const InventoryInitialNote = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
]
-// 库存余额 20230407
+
+// 库存余额
export const InventoryBalance = [
{ label: _Names.itemCode, prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" },
@@ -1972,7 +1765,7 @@ export const InventoryInitialNote = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
{ label: "箱码", prop: 'packingCode' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@@ -1999,11 +1792,8 @@ export const InventoryInitialNote = [
{ label: "库位组", prop: "locationGroup" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "到货时间", prop: "arriveDate",type:"dateTime" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
+
// 库存余额(解/冻)
export const InventoryBalanceActive = [
{ label: _Names.itemCode, prop: 'itemCode' },
@@ -2014,7 +1804,7 @@ export const InventoryBalanceActive = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库存状态", prop: "status",type: "filter", filters: "inventoryStage" },
{ label: "箱码", prop: 'packingCode' },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "生产日期", prop: "produceDate" ,type: "dateTime" },
@@ -2039,13 +1829,9 @@ export const InventoryBalanceActive = [
{ label: "库位组", prop: "locationGroup" },
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
{ label: "到货时间", prop: "arriveDate",type:"dateTime" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库存事务 20230410
+// 库存事务
export const InventoryTransaction = [
{ label: "事务编号", prop: "transNumber" },
{ label: _Names.itemCode, prop: "itemCode" },
@@ -2056,7 +1842,7 @@ export const InventoryTransaction = [
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "库位代码", prop: "locationCode" },
{ label: "批次", prop: "lot" },
{ label: "库存状态", prop: "status" ,type: "filter", filters: "inventoryStage" },
@@ -2081,12 +1867,9 @@ export const InventoryTransaction = [
{ label: "库位组", prop: "locationGroup" },
{ label: "事务ID", prop: "tenantId" },
{ label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransReplaceType" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库存快照 1
+
+// 库存快照
export const InventorySnapshot = [
{ label: "快照时间", prop: "snapshotTime",type: "dateTime" },
{ label: "备注", prop: 'remark' },
@@ -2104,7 +1887,7 @@ export const InventorySnapshot = [
{ label: "库位代码", prop: "locationCode" },
{ label: "库位组", prop: "locationGroup" },
{ label: "库区", prop: "locationArea" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
@@ -2115,12 +1898,9 @@ export const InventorySnapshot = [
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "入库时间", prop: "putInTime", type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 库存转移日志 20230410
+
+// 库存转移日志
export const InventoryTransferLog = [
{ label: "库存转移编号", prop: "transferNumber" },
{ label: "生效日期", prop: "activeDate",type: "dateTime" },
@@ -2159,17 +1939,13 @@ export const InventoryTransferLog = [
{ label: "到库区", prop: "toLocationArea" },
{ label: "从库位组", prop: "fromLocationGroup" },
{ label: "到库位组", prop: "toLocationGroup", },
- { label: "从ERP库位", prop: "fromLocationErpCode" },
- { label: "到ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.fromErpCode, prop: "fromLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "从批次", prop: "fromLot" },
{ label: "从箱码", prop: "fromPackingCode" },
- { label: "从仓库", prop: "fromWarehouseCode" },
- { label: "到仓库", prop: "toWarehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 预计入库存 20230411
+
+// 预计入库存
export const expectIn = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2182,7 +1958,7 @@ export const expectIn = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "生产日期", prop: "produceDate",type: "dateTime" },
{ label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -2196,12 +1972,9 @@ export const expectIn = [
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "事务ID", prop: "tenantId" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 预计入库存 20230411
+
+// 预计入库存
export const expectOut = [
{ label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" },
@@ -2214,7 +1987,7 @@ export const expectOut = [
{ label: "供应商批次", prop: "supplierBatch" },
{ label: "库区", prop: "locationArea" },
{ label: "库位组", prop: "locationGroup" },
- { label: "ERP储位", prop: "locationErpCode" },
+ { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "生产日期", prop: "produceDate", type: "dateTime" },
{ label: "状态", prop: "status", type: "filter", filters: "jobStatus" },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
@@ -2228,10 +2001,6 @@ export const expectOut = [
{ label: "到达时间", prop: "arriveDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate",type:"dateTime" },
{ label: "事务ID", prop: "tenantId" },
- { label: "仓库代码", prop: 'warehouseCode' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
// 物品安全库存预警
@@ -2246,11 +2015,10 @@ export const safetyStockWarning = [
{ label: "最小库存", prop: 'minStock' },
{ label: "安全库存", prop: 'safetyStock' },
{ label: "安全库存状态", prop: 'safetyStockStatus' },
- { label: "仓库代码", prop: "warehouseCode" },
{ label: "存储关系代码", prop: "storeValue" },
{ label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
- { label: "创建时间", prop: "creationTime",type: "dateTime",showProp: true },
- { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime',showProp: true },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "备注", prop: 'remark' },
]
@@ -2290,7 +2058,7 @@ export const splitPackingList = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 非生产领料申请 20230417
+// 非生产领料申请
export const pickingRequest = [
{ label: "领料单号码", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2311,11 +2079,9 @@ export const pickingRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 非生产领料审批 20230417
+
+// 非生产领料审批
export const pickingApproval = [
{ label: "领料单号码", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2336,11 +2102,9 @@ export const pickingApproval = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 非生产领料任务 20240109
+
+// 非生产领料任务
export const pickingJob = [
{
label: "任务编号",
@@ -2348,12 +2112,8 @@ export const pickingJob = [
fixed: "left",
type: "name",
},
- // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedIssueRequestNumber" },
- // { label: "上游任务编号", prop: "upStreamJobNumber" },
- // { label: "优先级", prop: 'priority',},
- // { label: "优先级增量", prop: 'priorityIncrement',},
{ label: "OA单号", prop: "oaNumber" },
{ label: "领料类别", prop: 'unplannedIssueType', type: "filter", filters: "unplannedIssueType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@@ -2362,14 +2122,11 @@ export const pickingJob = [
{ label: "部门名称", prop: "deptName" },
{ 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: 'jobDescription' },
- // { label: "备注", prop: 'remark' },
]
-// 非生产领料记录 20230417
+
+// 非生产领料记录
export const pickingNote = [
{ label: "领料记录单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2385,11 +2142,9 @@ export const pickingNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 非生产退料申请 20230417
+
+// 非生产退料申请
export const materialReturnRequest = [
{ label: "退料单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2410,11 +2165,9 @@ export const materialReturnRequest = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 非生产退料审批 20230417
+
+// 非生产退料审批
export const materialReturnApproval = [
{ label: "退料单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2435,11 +2188,9 @@ export const materialReturnApproval = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 非生产退料任务 20240109
+
+// 非生产退料任务
export const materialReturnJob = [
{
label: "任务编号",
@@ -2447,12 +2198,8 @@ export const materialReturnJob = [
fixed: "left",
type: "name",
},
- // { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "申请单号", prop: "unplannedReceiptRequestNumber" },
- // { label: "上游任务编号", prop: "upStreamJobNumber" },
- // { label: "优先级", prop: 'priority',},
- // { label: "优先级增量", prop: 'priorityIncrement',},
{ label: "OA单号", prop: "oaNumber" },
{ label: "退料类别", prop: 'unplannedReceiptType', type: "filter", filters: "unplannedReceiptType" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@@ -2461,14 +2208,11 @@ export const materialReturnJob = [
{ label: "部门名称", prop: "deptName" },
{ 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: 'jobDescription' },
- // { label: "备注", prop: 'remark' },
]
-// 非生产退料记录 20230417
+
+// 非生产退料记录
export const materialReturnNote = [
{ label: "退料记录单号", prop: "number" },
{ label: "OA单号", prop: "oaNumber" },
@@ -2484,11 +2228,9 @@ export const materialReturnNote = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 回收料收货记录 20230415
+
+// 回收料收货记录
export const recycledMaterialsReceipt = [
{ label: "回收料收货记录单号", prop: "number" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -2499,11 +2241,9 @@ export const recycledMaterialsReceipt = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 回收料调整申请 20230415
+
+// 回收料调整申请
export const recycledMaterialsAdjustmentApply = [
{ label: "回收料调整申请单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
@@ -2520,11 +2260,9 @@ export const recycledMaterialsAdjustmentApply = [
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 回收料调整记录 20230415
+
+// 回收料调整记录
export const materialsAdjustment = [
{ label: "回收料调整记录单号", prop: "number" },
{ label: "申请单号", prop: "requestNumber" },
@@ -2537,12 +2275,9 @@ export const materialsAdjustment = [
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
{ label: "任务单号", prop: "jobNumber" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨申请 20230417
+
+// 线边仓调拨申请
export const lineSideWarehouseAllocationRequest = [
{ label: "调拨申请单号", prop: "number" },
{ label: "状态", type: "filter", filters: "requestStatus", prop: "requestStatus" },
@@ -2560,12 +2295,9 @@ export const lineSideWarehouseAllocationRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨确认 20230417
+
+// 线边仓调拨确认
export const lineSideWarehouseAllocationConfirm = [
{ label: "调拨确认单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
@@ -2581,12 +2313,9 @@ export const lineSideWarehouseAllocationConfirm = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调拨记录 20230417
+
+// 线边仓调拨记录
export const lineSideWarehouseAllocationNote = [
{ label: "调拨确认单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
@@ -2602,12 +2331,9 @@ export const lineSideWarehouseAllocationNote = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 储位调拨记录 20230417
+
+// 储位调拨记录
export const interStorageAllocationNote = [
{ label: "调拨单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
@@ -2622,13 +2348,9 @@ export const interStorageAllocationNote = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨申请 20230410
+
+// 客户储位调拨申请
export const customerStorageAllocationRequest = [
{ label: "调拨申请单号", prop: "number" },
{ label: "状态", type: "filter", filters: "requestStatus", prop: "requestStatus" },
@@ -2646,12 +2368,9 @@ export const customerStorageAllocationRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨确认 20230410
+
+// 客户储位调拨确认
export const customerStorageAllocationConfirm = [
{ label: "调拨确认单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
@@ -2667,12 +2386,9 @@ export const customerStorageAllocationConfirm = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 客户储位调拨记录 20230410
+
+// 客户储位调拨记录
export const customerStorageAllocationNote = [
{ label: "调拨确认单号", prop: "number" },
{ label: "调拨申请单号", prop: "requestNumber" },
@@ -2688,12 +2404,9 @@ export const customerStorageAllocationNote = [
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
{ label: "备注", prop: 'remark' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "调拨类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 储位内移库记录 20230410
+
+// 储位内移库记录
export const intraStorageTransferNote = [
{ label: "移库单号", prop: "number" },
{ label: "移库时间", prop: "activeDate",type:"dateTime" },
@@ -2708,13 +2421,9 @@ export const intraStorageTransferNote = [
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "任务ID", prop: 'jobNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓缴库申请 20230415
+
+// 线边仓缴库申请
export const lineSideWarehousePaymentRequest = [
{ label: "缴库申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -2737,12 +2446,9 @@ export const lineSideWarehousePaymentRequest = [
{ label: "班组", prop: 'team' },
{ label: "事务ID", prop: "tenantId" },
{ label: "计划日期", prop: 'planDate' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓缴库记录 20230415
+
+// 线边仓缴库记录
export const lineSideWarehousePaymentNote = [
{ label: "缴库记录单号", prop: 'number' },
{ label: "生效日期", prop: 'activeDate',type: "dateTime" },
@@ -2758,13 +2464,9 @@ export const lineSideWarehousePaymentNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "类型", prop: 'type' },
- // { label: "receiptType", prop: 'receiptType' },
- // ************** 确认隐藏 ************************
]
-// 线边仓报废申请 20230412
+
+// 线边仓报废申请
export const lineSideWarehouseScrappingRequest = [
{ label: "报废申请单号", prop: 'number' },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -2781,12 +2483,9 @@ export const lineSideWarehouseScrappingRequest = [
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "报废类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓报废记录 20230412
+
+// 线边仓报废记录
export const lineSideWarehouseScrappingNote = [
{ label: "报废记录单号", prop: "number" },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
@@ -2799,12 +2498,9 @@ export const lineSideWarehouseScrappingNote = [
{ label: "事务ID", prop: "tenantId" },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "报废类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调整申请 20230417
+
+// 线边仓调整申请
export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "申请单号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
@@ -2821,12 +2517,9 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "type", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 线边仓调整记录 20230417
+
+// 线边仓调整记录
export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "记录单号", prop: "number" },
{ label: "操作员", prop: 'worker' },
@@ -2839,21 +2532,15 @@ export const lineSideWarehouseAdjustmentSheetNote = [
{ label: "备注", prop: 'remark' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "是否确认", prop: "confirmed", type: "filter", filters: "whetherOrNot" },
- // { label: "确认时间", prop: "confirmTime",type:"dateTime" },
- // { label: "ID", prop: 'id' },
- // { label: "类型", prop: 'type' },
- // ************** 确认隐藏 ************************
]
-// 盘点计划 20230415
+
+// 盘点计划
export const CountPlan = [
{ label: "盘点计划单号", prop: "number" },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
{ label: "开始时间", prop: "beginTime",type: "dateTime" },
{ label: "结束时间", prop: "endTime", type: "dateTime" },
{ label: "计划时间", prop: 'planTime', type: "dateTime" },
- // { label: "盘点执行方式", prop: "requestType",type: "filter", filters: "requestType" },
{ label: "盘点模式", prop: "inventoryMode",type: "filter", filters: "inventoryMode" },
{ label: "盘点次数", prop: "inventoryStage" },
{ label: "库位JSON", prop: 'jsonLocationCodes',type:"json" },
@@ -2873,14 +2560,9 @@ export const CountPlan = [
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "事务ID", prop: "tenantId" },
- // { label: "ERP料号JSON", prop: 'jsonItemCodes' },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
- // { label: "ID", prop: 'id' },
- // { label: "jsonInventoryStatus", prop: 'jsonInventoryStatus' },
- // ************** 确认隐藏 ************************
]
-// 盘点任务 20230415
+
+// 盘点任务
export const CountJob = [
{ label: "盘点任务号", prop: "number" },
{ label: "盘点计划号", prop: "countPlanNumber" },
@@ -2911,13 +2593,9 @@ export const CountJob = [
{ label: "描述", prop: "description" },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "工作组代码", prop: "workGroupCode" },
- { label: "仓库代码", prop: "warehouseCode" },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "countStage", type: "filter", filters: "checkStage" },
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 盘点记录 20230415
+
+// 盘点记录
export const CountNote = [
{ label: "盘点记录单号", prop: "number" },
{ label: "盘点计划单号", prop: "countPlanNumber" },
@@ -2934,12 +2612,9 @@ export const CountNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改者", prop: "lastModifierId" },
{ label: "描述", prop: "description" },
- // ************** 确认隐藏 ************************
- // { label: "阶段", prop: "stage", type: "filter", filters: "stageType" },
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 盘点调整申请 20230415
+
+// 盘点调整申请
export const CountPlanAdjust = [
{ label: "盘点调整申请单号", prop: "number" },
{ label: "状态",type: "filter", filters: "requestStatus", prop: "requestStatus" },
@@ -2958,11 +2633,9 @@ export const CountPlanAdjust = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
-// 盘点调整记录 20230415
+
+// 盘点调整记录
export const CountAdjustNote = [
{ label: "盘点调整单号", prop: "number" },
{ label: "盘点记录单号", prop: 'countNoteNumber' },
@@ -2976,15 +2649,11 @@ export const CountAdjustNote = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
{ label: "上次修改者", prop: "lastModifierId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // { label: "isAdjusted", prop: 'isAdjusted' },
- // ************** 确认隐藏 ************************
]
// 消息管理
/**/
-// 消息类型 20230414
+// 消息类型
export const MessageType = [
{ label: "消息类别代码", prop: "messageTypeCode" },
{ label: "消息类别名称", prop: "messageTypeName" },
@@ -2998,14 +2667,11 @@ export const MessageType = [
{ label: "是否发送Email", prop: 'isSendEmail', type: "filter", filters: "whetherOrNot" },
{ label: "是否发送Sms", prop: 'isSendSms', type: "filter", filters: "whetherOrNot" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
]
// 系统权限管理
/**/
-// 部门信息维护 1
+// 部门信息维护
export const Department = [
{ label: "部门代码", prop: "code" },
{ label: "部门名称", prop: "name" },
@@ -3017,37 +2683,11 @@ export const Department = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "事务ID", prop: "tenantId" },
- // ************** 确认隐藏 ************************
- // { label: "ID", prop: 'id' },
- // ************** 确认隐藏 ************************
-]
-
-// 位置码
-export const PositionCode = [
- {
- label: '位置码',
- prop: "code",
- fixed: "left",
- type: "name"
- },
- { label: "位置码类型", prop: 'type', type: "filter", filters: "positionCodeType" },
- { label: _Names.itemCode, prop: "partCode" },
- { label: _Names.itemName, prop: "partName" },
- { label: _Names.itemDesc1, prop: "partDesc" },
- // { label: _Names.itemDesc2, prop: "desc2" },
- { label: _Names.basicUom, prop: "basicUom" },
- { label: "箱数/数量", prop: "stdPackQty" },
- { label: "目标库位代码", prop: "locationCode" },
- { label: "目标库位名称", prop: "locationName" },
- { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
- { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
- { label: _Public.remark, prop: "remark" },
]
// 器具
export const Utensil = [
{ label: '器具代码',prop: "code",},
- // { label: _Names.stdPackQty, prop: "stdQty" },
{ label: "器具类型", prop: 'type',type:"filter",filters:"utensilType" },
{ label: "器具规格", prop: "model",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@@ -3147,12 +2787,13 @@ export const IssueRequestZS = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 注塑任务
export const IssueJobZS = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -3172,6 +2813,7 @@ export const IssueJobZS = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 注塑记录
export const IssueNoteZS = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -3196,12 +2838,13 @@ export const IssueRequestPT = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂任务
export const IssueJobPT = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -3221,6 +2864,7 @@ export const IssueJobPT = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 喷涂记录
export const IssueNotePT = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -3245,12 +2889,13 @@ export const IssueRequestZP = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配任务
export const IssueJobZP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -3270,6 +2915,7 @@ export const IssueJobZP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 装配记录
export const IssueNoteZP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -3294,12 +2940,13 @@ export const IssueRequestBP = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品任务
export const IssueJobBP = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -3319,6 +2966,7 @@ export const IssueJobBP = [
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
]
+
// 备品记录
export const IssueNoteBP = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -3340,16 +2988,13 @@ export const IssueNoteBP = [
export const transferLibRequest = [
{ label: "申请编号", prop: "number",type:"name",fixed: "left", },
{ label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
+
// 业务库移任务
export const transferLibJob = [
{ label: "任务编号", prop: "number",type:"name",fixed: "left", },
@@ -3357,16 +3002,13 @@ export const transferLibJob = [
{ label: "状态", prop: "jobStatus",type: "filter", filters: "jobStatus" },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: 'remark' },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
]
+
// 业务库移记录
export const transferLibNote = [
{ label: "记录编号", prop: "number",type:"name",fixed: "left", },
@@ -3374,10 +3016,6 @@ export const transferLibNote = [
{ label: "任务单号", prop: 'jobNumber' },
{ label: "调拨类型", prop: 'type' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
- // { label: "回调服务名称", prop: "callServerName" },
- // { label: "回调业务类型", prop: "callBusinessType" },
- // { label: "传入申请单号", prop: "callRequestNumber" },
- // { label: "传入任务单号", prop: "callJobNumber" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
{ label: "确认时间", prop: 'confirmTime' },
{ label: "备注", prop: 'remark' },
@@ -3393,12 +3031,13 @@ export const ThirdLocationRequest = [
{ label: "操作员", prop: 'worker' },
{ label: "生产线", prop: 'prodLine' },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { 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" },
]
+
// 三方库任务
export const ThirdLocationJob = [
{ label: "任务单号", prop: "number", fixed: "left", type: "name" },
@@ -3423,6 +3062,7 @@ export const ThirdLocationJob = [
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
]
+
// 三方库记录
export const ThirdLocationNote = [
{ label: "记录单号", prop: "number", fixed: "left", type: "name" },
@@ -3518,7 +3158,7 @@ export const KittingIssueRequest = [
{ label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" },
{ label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
{ label: "目标库位代码", prop: "toLocationCode" },
- { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: _Names.toErpCode, prop: "toLocationErpCode" },
{ label: "备注", prop: "remark" },
{ label: "操作员", prop: "worker" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -3571,7 +3211,6 @@ export const isPadForTransferLibJob = [
{ label: "回调业务类型", prop: "callBusinessType" },
{ label: "传入申请单号", prop: "callRequestNumber" },
{ label: "传入任务单号", prop: "callJobNumber" },
- // { label: "任务类型", prop: 'jobType' },
{ label: "任务描述", prop: 'jobDescription' },
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
@@ -3584,4 +3223,4 @@ export const isPadForTransferLibJob = [
{ label: "完成时间", prop: "completeTime", type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
-]
+]
\ No newline at end of file
diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummaryERP_pay.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummaryERP_pay.vue
index fe2aec47a..ebf3cd9d2 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummaryERP_pay.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookSummaryERP_pay.vue
@@ -1,5 +1,5 @@
-
+