diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 200c45b6c..e8a7970ef 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -414,6 +414,150 @@ export const constantRoutes = [
}
}]
},
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticRequestZS',
+ component: () => import('@/views/materialIssueManage/automaticZS/automaticRequestZS.vue'),
+ name: 'automaticRequestZS',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(注塑)申请',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticJobZS',
+ component: () => import('@/views/materialIssueManage/automaticZS/automaticJobZS.vue'),
+ name: 'automaticJobZS',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(注塑)任务',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticNoteZS',
+ component: () => import('@/views/materialIssueManage/automaticZS/automaticNoteZS.vue'),
+ name: 'automaticNoteZS',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(注塑)记录',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticRequestPT',
+ component: () => import('@/views/materialIssueManage/automaticPT/automaticRequestPT.vue'),
+ name: 'automaticRequestPT',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(喷涂)申请',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticJobPT',
+ component: () => import('@/views/materialIssueManage/automaticPT/automaticJobPT.vue'),
+ name: 'automaticJobPT',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(喷涂)任务',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticNotePT',
+ component: () => import('@/views/materialIssueManage/automaticPT/automaticNotePT.vue'),
+ name: 'automaticNotePT',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(喷涂)记录',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticRequestZP',
+ component: () => import('@/views/materialIssueManage/automaticZP/automaticRequestZP.vue'),
+ name: 'automaticRequestZP',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(装配)申请',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticJobZP',
+ component: () => import('@/views/materialIssueManage/automaticZP/automaticJobZP.vue'),
+ name: 'automaticJobZP',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(装配)任务',
+ icon: '成品发运任务',
+ }
+ }]
+ },
+ {
+ path: '/',
+ component: Layout,
+ redirect: '/gridlayout',
+ hidden: true,
+ children: [{
+ path: 'automaticNoteZP',
+ component: () => import('@/views/materialIssueManage/automaticZP/automaticNoteZP.vue'),
+ name: 'automaticNoteZP',
+ meta: {
+ keepAlive : true,
+ title: '自动叫料(装配)记录',
+ icon: '成品发运任务',
+ }
+ }]
+ },
]
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index a6a986f73..8ccf279c9 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -3681,7 +3681,7 @@ export const completDumpNoteZP = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
]
-// 人工发料申请(注塑)
+// 人工注塑申请
export const IssueRequestZS = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3698,7 +3698,7 @@ export const IssueRequestZS = [
{ label: "请求箱数量", prop: "boxQty" },
{ label: "备注", prop: "remark" },
]
-// 人工发料任务(注塑)
+// 人工注塑任务
export const IssueJobZS = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -3765,7 +3765,7 @@ export const IssueJobZS = [
{ label: "位置码", prop: 'positionCode' },
{ label: "推荐类型", prop: 'recommendType' },
]
-// 人工发料记录(注塑)
+// 人工注塑记录
export const IssueNoteZS = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" },
@@ -4175,6 +4175,462 @@ export const IssueNoteZP = [
// ************** 确定隐藏 ************************
]
+// 自动叫料(注塑)申请
+export const automaticRequestZS = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "已发数量", prop: "issuedQty" },
+ { label: "已收数量", prop: "receivedQty" },
+ { label: "请求未发", prop: "toBeIssuedQty" },
+ { label: "已发未收", prop: "toBeReceivedQty" },
+ { label: "请求未收", prop: "notFinishQty" },
+ { label: "请求箱数量", prop: "boxQty" },
+ { label: "备注", prop: "remark" },
+]
+// 自动叫料(注塑)任务
+export const automaticJobZS = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+// 自动叫料(注塑)记录
+export const automaticNoteZS = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+
+// 自动叫料(喷涂)申请
+export const automaticRequestPT = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "已发数量", prop: "issuedQty" },
+ { label: "已收数量", prop: "receivedQty" },
+ { label: "请求未发", prop: "toBeIssuedQty" },
+ { label: "已发未收", prop: "toBeReceivedQty" },
+ { label: "请求未收", prop: "notFinishQty" },
+ { label: "请求箱数量", prop: "boxQty" },
+ { label: "备注", prop: "remark" },
+]
+// 自动叫料(喷涂)任务
+export const automaticJobPT = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+// 自动叫料(喷涂)记录
+export const automaticNotePT = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+
+// 自动叫料(装配)申请
+export const automaticRequestZP = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "已发数量", prop: "issuedQty" },
+ { label: "已收数量", prop: "receivedQty" },
+ { label: "请求未发", prop: "toBeIssuedQty" },
+ { label: "已发未收", prop: "toBeReceivedQty" },
+ { label: "请求未收", prop: "notFinishQty" },
+ { label: "请求箱数量", prop: "boxQty" },
+ { label: "备注", prop: "remark" },
+]
+// 自动叫料(装配)任务
+export const automaticJobZP = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+// 自动叫料(装配)记录
+export const automaticNoteZP = [
+ { label: "物品代码", prop: "itemCode", fixed: "left" },
+ { label: "物品名称", prop: "itemName" },
+ { label: "物品描述1", prop: "itemDesc1" },
+ { label: "物品描述2", prop: "itemDesc2" },
+ { label: "物品单位", prop: "uom" },
+ { label: "标包数量", prop: "stdPackQty" ,isNumber:true},
+ { label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
+ { label: "请求数量", prop: 'requestQty' },
+ { label: "请求库位", prop: 'requestLocationCode' },
+ { label: "请求库区", prop: 'requestLocationArea' },
+ { label: "请求库位组", prop: 'requestLocationGroup' },
+ { label: "请求ERP库位", prop: 'requestLocationErpCode' },
+ { label: "推荐来源数量", prop: 'recommendFromQty' },
+ { label: "推荐目标数量", prop: 'recommendToQty' },
+ { label: "推荐来源箱标签", prop: 'recommendFromPackingCode' },
+ { label: "推荐目标箱标签", prop: 'recommendToPackingCode' },
+ { label: "推荐来源库位", prop: 'recommendFromLocationCode' },
+ { label: "推荐目标库位", prop: 'recommendToLocationCode' },
+ { label: "推荐来源库区", prop: 'recommendFromLocationArea' },
+ { label: "推荐目标库区", prop: 'recommendToLocationArea' },
+ { label: "推荐来源库位组", prop: 'recommendFromLocationGroup' },
+ { label: "推荐目标库位组", prop: 'recommendToLocationGroup' },
+ { label: "推荐来源ERP库位", prop: 'recommendFromLocationErpCode' },
+ { label: "推荐目标ERP库位", prop: 'recommendToLocationErpCode' },
+ { label: "推荐来源供应商批次", prop: 'recommendFromSupplierBatch' },
+ { label: "推荐目标供应商批次", prop: 'recommendToSupplierBatch' },
+ { label: "推荐来源批次过期时间", prop: 'recommendFromExpireDate', type: "dateTime" },
+ { label: "推荐目标批次过期时间", prop: 'recommendToExpireDate', type: "dateTime" },
+ { label: "实际来源箱标签", prop: 'handledFromPackingCode' },
+ { label: "实际目标箱标签", prop: 'handledToPackingCode' },
+ { label: "实际来源库位", prop: 'handledFromLocationCode' },
+ { label: "实际目标库位", prop: 'handledToLocationCode' },
+ { label: "实际来源库区", prop: 'handledFromLocationArea' },
+ { label: "实际目标库区", prop: 'handledToLocationArea' },
+ { label: "实际来源库位组", prop: 'handledFromLocationGroup' },
+ { label: "实际目标库位组", prop: 'handledToLocationGroup ' },
+ { label: "实际来源ERP库位", prop: 'handledFromLocationErpCode' },
+ { label: "实际目标ERP库位", prop: 'handledToLocationErpCode' },
+ { label: "实际来源数量", prop: 'handledFromQty' },
+ { label: "实际目标数量", prop: 'handledToQty' },
+ { label: "实际来源供应商批次", prop: 'handledFromSupplierBatch' },
+ { label: "实际目标供应商批次", prop: 'handledToSupplierBatch' },
+ { label: "实际来源批次过期时间", prop: 'handledFromExpireDate', type: "dateTime" },
+ { label: "实际目标批次过期时间", prop: 'handledToExpireDate', type: "dateTime" },
+ { label: "库移来源数量", prop: 'transferLibFromQty' },
+ { label: "库移目标数量", prop: 'transferLibToQty' },
+ { label: "库移来源箱标签", prop: 'transferLibFromPackingCode' },
+ { label: "库移目标箱标签", prop: 'transferLibToPackingCode' },
+ { label: "库移来源库位", prop: 'transferLibFromLocationCode' },
+ { label: "库移目标库位", prop: 'transferLibToLocationCode' },
+ { label: "库移来源ERP库位", prop: 'transferLibFromLocationErpCode' },
+ { label: "库移目标ERP库位", prop: 'transferLibToLocationErpCode' },
+ { label: "库移来源库区", prop: 'transferLibFromLocationArea' },
+ { label: "库移目标库区", prop: 'transferLibToLocationArea' },
+ { label: "库移来源库位组", prop: 'transferLibFromLocationGroup' },
+ { label: "库移目标库位组", prop: 'transferLibToLocationGroup' },
+ { label: "库移来源批次供应商批次", prop: 'transferLibFromSupplierBatch' },
+ { label: "库移目标批次供应商批次", prop: 'transferLibToSupplierBatch' },
+ { label: "库移来源批次过期时间", prop: 'transferLibFromExpireDate', type: "dateTime" },
+ { label: "库移目标批次过期时间", prop: 'transferLibToExpireDate', type: "dateTime" },
+ { label: "在途库库位", prop: 'onTheWayLocationCode' },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "位置码", prop: 'positionCode' },
+ { label: "推荐类型", prop: 'recommendType' },
+]
+
// 业务库移申请
export const transferLibRequest = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index d5c2e01cd..41082fc06 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -4539,6 +4539,180 @@ export const IssueNoteZP = [
// ************** 确认隐藏 ************************
]
+// 自动叫料(注塑)申申请
+export const automaticRequestZS = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(注塑)申任务
+export const automaticJobZS = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(注塑)申记录
+export const automaticNoteZS = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+ { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
+// 自动叫料(喷涂)申请
+export const automaticRequestPT = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(喷涂)申任务
+export const automaticJobPT = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(喷涂)申记录
+export const automaticNotePT = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+ { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
+// 自动叫料(装配)申请
+export const automaticRequestZP = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(装配)申任务
+export const automaticJobZP = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(装配)申记录
+export const automaticNoteZP = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ width: orderWidth
+ },
+ { label: "申请单号", prop: 'requestNumber',width: orderWidth },
+ { label: "任务单号", prop: 'jobNumber',width: orderWidth },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
// 业务库移申请
export const transferLibRequest = [
{ label: "申请编号", prop: "number",type:"name",fixed: "left", },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index ff591e99b..053727e32 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -3246,6 +3246,7 @@ export const IssueNotePT = [
// ************** 确认隐藏 ************************
]
+
// 人工发料申请(装配)
export const IssueRequestZP = [
{ label: "申请编号", prop: "number" },
@@ -3329,6 +3330,172 @@ export const IssueNoteZP = [
// ************** 确认隐藏 ************************
]
+// 自动叫料(注塑)申请
+export const automaticRequestZS = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(注塑)任务
+export const automaticJobZS = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(注塑)记录
+export const automaticNoteZS = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "申请单号", prop: 'requestNumber' },
+ { label: "任务单号", prop: 'jobNumber' },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
+// 自动叫料(喷涂)申请
+export const automaticRequestPT = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(喷涂)任务
+export const automaticJobPT = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(喷涂)记录
+export const automaticNotePT = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "申请单号", prop: 'requestNumber' },
+ { label: "任务单号", prop: 'jobNumber' },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
+
+// 自动叫料(装配)申请
+export const automaticRequestZP = [
+ {
+ label: "申请编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
+ { label: "叫料库位代码", prop: "toLocationCode" },
+ { label: "目标ERP库位", prop: "toLocationErpCode" },
+ { label: "操作员", prop: "worker" },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'isUseOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ // { label: "创建时间", prop: "creationTime", type: "dateTime" },
+ // { label: "来源库位列表", prop: 'fromLocationCodeJsonList',type:"showDetail",isJson:true,showProp:true },
+ // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+ // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+]
+// 自动叫料(装配)任务
+export const automaticJobZP = [
+ {
+ label: "任务编号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "要货单号", prop: 'injectionIssueRequestNumber' },
+ { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
+ { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
+ { label: "生产线", prop: 'prodLine' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "创建时间", prop: "creationTime", type: "dateTime" },
+
+]
+// 自动叫料(装配)记录
+export const automaticNoteZP = [
+ {
+ label: "记录单号",
+ prop: "number",
+ fixed: "left",
+ type: "name",
+ },
+ { label: "申请单号", prop: 'requestNumber' },
+ { label: "任务单号", prop: 'jobNumber' },
+ { label: "操作员", prop: 'worker' },
+ { label: "备注", prop: 'remark' },
+ { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+ { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
+ { label: "确认时间", prop: 'confirmTime' },
+ { label: "创建时间", prop: "creationTime",type: "dateTime" },
+]
+
// 业务库移申请
export const transferLibRequest = [
{ label: "申请编号", prop: "number",type:"name",fixed: "left", },
diff --git a/fe/PC/src/views/materialIssueManage/automaticPT/automaticJobPT.vue b/fe/PC/src/views/materialIssueManage/automaticPT/automaticJobPT.vue
new file mode 100644
index 000000000..ee6002bd4
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticPT/automaticJobPT.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue b/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue
new file mode 100644
index 000000000..8160cf693
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticPT/automaticNotePT.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbutton"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticPT/automaticRequestPT.vue b/fe/PC/src/views/materialIssueManage/automaticPT/automaticRequestPT.vue
new file mode 100644
index 000000000..4e90ea764
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticPT/automaticRequestPT.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZP/automaticJobZP.vue b/fe/PC/src/views/materialIssueManage/automaticZP/automaticJobZP.vue
new file mode 100644
index 000000000..997955f95
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZP/automaticJobZP.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue b/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue
new file mode 100644
index 000000000..ca3e56d1b
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZP/automaticNoteZP.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbutton"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZP/automaticRequestZP.vue b/fe/PC/src/views/materialIssueManage/automaticZP/automaticRequestZP.vue
new file mode 100644
index 000000000..9cac9063c
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZP/automaticRequestZP.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZS/automaticJobZS.vue b/fe/PC/src/views/materialIssueManage/automaticZS/automaticJobZS.vue
new file mode 100644
index 000000000..23c33a36f
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZS/automaticJobZS.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue b/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue
new file mode 100644
index 000000000..03d2bd65b
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZS/automaticNoteZS.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbutton"
+ @handleCommand="drawerHandle"
+ @close-value="closeValue"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file
diff --git a/fe/PC/src/views/materialIssueManage/automaticZS/automaticRequestZS.vue b/fe/PC/src/views/materialIssueManage/automaticZS/automaticRequestZS.vue
new file mode 100644
index 000000000..e95a06370
--- /dev/null
+++ b/fe/PC/src/views/materialIssueManage/automaticZS/automaticRequestZS.vue
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
(displayDialog.detailsDialog = val)"
+ @drawerbutton="drawerbuttonHandle"
+ @close-value="closeValue"
+ :currenButtonData="currenButtonData"
+ :tableColumns="detailsTableColumns"
+ :totalCount="totalCountDetails"
+ :MaxResultCount="MaxResultCountDetails"
+ @alterResultCountDetails="alterResultCountDetails"
+ @alertoldSkipCountDetails="alertoldSkipCountDetails"
+ >
+
+
+
+
\ No newline at end of file