Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/api/wms-api.js

@@ -457,8 +457,9 @@ export function createAndHandle(data) {
 // 人工叫料申请 | 人工发料任务 | 人工发料记录 | 自动叫料申请 | 自动发料任务 | 自动发料记录 | 直接发料记录
 // 完工收货缴库申请 | 线边仓缴库申请 | 线边仓缴库记录 | 线边仓报废申请 | 线边仓报废记录 | 原料报废记录
 export function materialRequestByType(data, url, params) {
+  let _type = params.type?params.type:params.requestType
   return request({
-    url: baseURL + url + '/' + params.type,
+    url: baseURL + url + '/' + _type,
     method: 'post',
     params: params,
     data

fe/PC/src/api/wms-job.js

@@ -168,8 +168,9 @@ export function InspectJobHandle(data, params, url) {
 
 //人工发料任务 | 自动发料任务
 export function materialRequestByType(data, url, params) {
+  let _type = params.type?params.type:params.requestType
   return request({
-    url: baseURL + url + '/' + params.type,
+    url: baseURL + url + '/' + _type,
     method: 'post',
     params: params,
     data

fe/PC/src/utils/detailsTableColumns/index.js

@@ -460,45 +460,55 @@ export const PutawayNote =  [
   // { label: "供应商描述", prop: "supplierSimpleName" },
   // -----------------------------------------------------------------------
 ]
-// 人工叫料申请  待确认
+// 人工叫料申请  20230411
 export const IssueRequest =  [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  // 批次占位
-  // 箱码占位
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  // 来源库位占位
+  { label: "创建者ID", prop: 'creatorId' },
-  // 来源ERP库位
   { label: "目标库位", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "生成任务数量", prop: 'issuedQty' },
   { label: "已收数量", prop: 'receivedQty' },
-  { label: "在途库位", prop: 'onTheWayLocationCode' },
+  { label: "单据号", prop: 'number' },
   // -----------------------------------------------------------------------
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "生产线", prop: 'prodLine' },
   { label: "来源库区", prop: 'fromLocationArea' },
-  { label: "目标库区", prop: 'toLocationArea' },
   { label: "工作中心", prop: 'workStation' },
   { label: "过期时间", prop: 'expiredTime' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "目标库位组", prop: 'toLocationGroup' },
   { 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: "请求未发", prop: 'toBeIssuedQty' },
+  { label: "已发未收", prop: 'toBeReceivedQty' },
+  { label: "请求未收", prop: 'notFinishQty' },
+  // { label: "目标库区", prop: 'toLocationArea' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "目标库位组", prop: 'toLocationGroup' },
+  // { label: "在途库位", prop: 'onTheWayLocationCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // 批次占位
+  // 箱码占位
+  // 来源库位占位
+  // 来源ERP库位
   // -----------------------------------------------------------------------
 ]
-// 人工发料任务 已调整
+// 人工发料任务 20230411
 export const IssueJob =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
-  { label: "单位", prop: "recommendUom" },
   { label: "推荐批次", prop: "recommendLot" },
   { label: "实际批次", prop: "handledLot" },
   { label: "推荐数量", prop: 'recommendQty' },
@@ -506,19 +516,29 @@ export const IssueJob =  [
   { label: "推荐箱码", prop: "recommendPackingCode" },
   { label: "实际箱码", prop: "handledPackingCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "推荐库位", prop: "recommendLocationCode" },
+  { label: "创建者ID", prop: 'creatorId' },
-  { label: "实际库位", prop: "handledLocationCode" },
-  { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
-  { label: "实际ERP库位", prop: 'handledLocationErpCode' },
   { label: "在途库位", prop: 'onTheWayLocationCode' },
   // -----------------------------------------------------------------------
   { label: "标包数量", prop: "stdPackQty" },
-  { label: "标包单位", prop: "stdPackUom" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "任务编号", prop: 'number',width: orderWidth },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
-  { label: "状态", prop: 'status' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "计量单位", prop: 'uom' },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "到库区", prop: 'toLocationArea' },
+  { label: "到库位组", prop: 'toLocationGroup' },
+  { label: "到ERP库位", prop: 'toLocationErpCode' },
+  { label: "到仓库", prop: 'toWarehouseCode' },
   { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
   { label: "实际供应商批次", prop: 'handledSupplierBatch' },
   { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
@@ -527,12 +547,6 @@ export const IssueJob =  [
   { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
   { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
   { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
-  { label: "推荐库位组", prop: 'recommendLocationGroup' },
-  { label: "实际库位组", prop: 'handledLocationGroup' },
-  { label: "推荐库区", prop: 'recommendLocationArea' },
-  { label: "实际库区", prop: 'handledLocationArea' },
-  { label: "推荐计量单位", prop: 'recommendUom' },
-  { label: "实际计量单位", prop: 'handledUom' },
   { label: "请求库位", prop: 'requestLocationCode' },
   { label: "到库位", prop: 'toLocationCode' },
   { label: "生产线", prop: 'prodLine' },
@@ -545,22 +559,39 @@ export const IssueJob =  [
   { label: "plannedSplitRule", prop: 'plannedSplitRule' },
   { label: "计划开始时间", prop: 'planBeginTime' },
   { label: "每次配送数量", prop: 'deliveryQty' },
-  { label: "库位组", prop: 'locationGroup' },
+  { label: "ID", prop: 'id' },
-  { label: "库区", prop: 'locationArea' },
+  { label: "主表ID", prop: "masterID" },
-  { label: "ERP库位", prop: 'locationErpCode' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "单位", prop: "recommendUom" },
+  // { label: "标包单位", prop: "stdPackUom" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "状态", prop: 'status' },
+  // { label: "库位组", prop: 'locationGroup' },
+  // { label: "库区", prop: 'locationArea' },
+  // { label: "ERP库位", prop: 'locationErpCode' },
+  // { label: "推荐库位", prop: "recommendLocationCode" },
+  // { label: "实际库位", prop: "handledLocationCode" },
+  // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
+  // { label: "实际ERP库位", prop: 'handledLocationErpCode' },
   // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "推荐库位组", prop: 'recommendLocationGroup' },
+  // { label: "实际库位组", prop: 'handledLocationGroup' },
+  // { label: "推荐库区", prop: 'recommendLocationArea' },
+  // { label: "实际库区", prop: 'handledLocationArea' },
+  // { label: "推荐计量单位", prop: 'recommendUom' },
+  // { label: "实际计量单位", prop: 'handledUom' },
   // -----------------------------------------------------------------------
 ]
-// 人工发料记录 已调整
+// 人工发料记录 20230411
 export const IssueNote =  [
   { label: "物品代码", prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  { label: "批次", prop: "fromLot" },
-  { label: "箱码", prop: "fromPackingCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "来源库位", prop: "fromLocationCode" },
   { label: "来源ERP库位", prop: 'fromLocationErpCode' },
   { label: "目标库位", prop: "toLocationCode" },
@@ -569,12 +600,11 @@ export const IssueNote =  [
   // -----------------------------------------------------------------------
   { label: "生效日期", prop: "arriveDate", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "任务编号", prop: 'number',width: orderWidth },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "来源仓库", prop: 'fromWarehouseCode' },
   { label: "目标仓库", prop: 'toWarehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
@@ -587,53 +617,93 @@ export const IssueNote =  [
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
   { label: "发料时间", prop: 'issueTime', type: "dateTime" },
-  { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
   { label: "生产线", prop: 'prodLine' },
   { label: "工作中心", prop: 'workStation' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "推荐数量", prop: 'recommendQty' },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "实际数量", prop: 'handledQty' },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+  { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+  { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+  { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+  { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+  { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+  { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+  { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
   // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
 ]
-// 自动叫料申请 待确认
+// 自动叫料申请 20230411
 export const automaticCallApply =  [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "叫料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  // 批次占位
-  // 箱码占位
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  // 来源库位占位
+  { label: "创建者ID", prop: 'creatorId' },
-  // 来源ERP库位
   { label: "目标库位", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: "toLocationErpCode" },
   { label: "生成任务数量", prop: 'issuedQty' },
   { label: "已收数量", prop: 'receivedQty' },
-  { label: "外部单号(其他系统)", prop: 'foreignNumber' },
+  { label: "单据号", prop: 'number' },
-  { label: "在途库位", prop: 'onTheWayLocationCode' },
   // -----------------------------------------------------------------------
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "生产线", prop: 'prodLine' },
   { label: "来源库区", prop: 'fromLocationArea' },
-  { label: "目标库区", prop: 'toLocationArea' },
   { label: "工作中心", prop: 'workStation' },
   { label: "过期时间", prop: 'expiredTime' },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "目标库位组", prop: 'toLocationGroup' },
   { 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: "请求未发", prop: 'toBeIssuedQty' },
+  { label: "已发未收", prop: 'toBeReceivedQty' },
+  { label: "请求未收", prop: 'notFinishQty' },
+  // { label: "目标库区", prop: 'toLocationArea' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "目标库位组", prop: 'toLocationGroup' },
+  // { label: "在途库位", prop: 'onTheWayLocationCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // 批次占位
+  // 箱码占位
+  // 来源库位占位
+  // 来源ERP库位
   // -----------------------------------------------------------------------
 ]
-// 自动发料任务 已调整
+// 自动发料任务 20230411
 export const automaticCallJob =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
-  { label: "单位", prop: "recommendUom" },
+  { label: "物品描述2", prop: "itemDesc2" },
+  { label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
   { label: "推荐批次", prop: "recommendLot" },
   { label: "实际批次", prop: "handledLot" },
   { label: "推荐数量", prop: 'recommendQty' },
@@ -641,20 +711,29 @@ export const automaticCallJob =  [
   { label: "推荐箱码", prop: "recommendPackingCode" },
   { label: "实际箱码", prop: "handledPackingCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
-  { label: "推荐库位", prop: "recommendLocationCode" },
+  { label: "创建者ID", prop: 'creatorId' },
-  { label: "实际库位", prop: "handledLocationCode" },
-  { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
-  { label: "实际ERP库位", prop: 'handledLocationErpCode' },
-  { label: "外部单号(其他系统)", prop: 'foreignNumber' },
   { label: "在途库位", prop: 'onTheWayLocationCode' },
   // -----------------------------------------------------------------------
   { label: "标包数量", prop: "stdPackQty" },
-  { label: "标包计量单位", prop: "stdPackUom" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "任务编号", prop: 'number' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "任务编号", prop: 'number',width: orderWidth },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
-  { label: "状态", prop: 'status' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "计量单位", prop: 'uom' },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "到库区", prop: 'toLocationArea' },
+  { label: "到库位组", prop: 'toLocationGroup' },
+  { label: "到ERP库位", prop: 'toLocationErpCode' },
+  { label: "到仓库", prop: 'toWarehouseCode' },
   { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
   { label: "实际供应商批次", prop: 'handledSupplierBatch' },
   { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
@@ -663,12 +742,6 @@ export const automaticCallJob =  [
   { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
   { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
   { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
-  { label: "推荐库位组", prop: 'recommendLocationGroup' },
-  { label: "实际库位组", prop: 'handledLocationGroup' },
-  { label: "推荐库区", prop: 'recommendLocationArea' },
-  { label: "实际库区", prop: 'handledLocationArea' },
-  { label: "推荐计量单位", prop: 'recommendUom' },
-  { label: "实际计量单位", prop: 'handledUom' },
   { label: "请求库位", prop: 'requestLocationCode' },
   { label: "到库位", prop: 'toLocationCode' },
   { label: "生产线", prop: 'prodLine' },
@@ -681,35 +754,52 @@ export const automaticCallJob =  [
   { label: "plannedSplitRule", prop: 'plannedSplitRule' },
   { label: "计划开始时间", prop: 'planBeginTime' },
   { label: "每次配送数量", prop: 'deliveryQty' },
-  { label: "库位组", prop: 'locationGroup' },
+  { label: "ID", prop: 'id' },
-  { label: "库区", prop: 'locationArea' },
+  { label: "主表ID", prop: "masterID" },
-  { label: "ERP库位", prop: 'locationErpCode' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "单位", prop: "recommendUom" },
+  // { label: "标包单位", prop: "stdPackUom" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "状态", prop: 'status' },
+  // { label: "库位组", prop: 'locationGroup' },
+  // { label: "库区", prop: 'locationArea' },
+  // { label: "ERP库位", prop: 'locationErpCode' },
+  // { label: "推荐库位", prop: "recommendLocationCode" },
+  // { label: "实际库位", prop: "handledLocationCode" },
+  // { label: "推荐ERP库位", prop: 'recommendLocationErpCode' },
+  // { label: "实际ERP库位", prop: 'handledLocationErpCode' },
   // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "推荐库位组", prop: 'recommendLocationGroup' },
+  // { label: "实际库位组", prop: 'handledLocationGroup' },
+  // { label: "推荐库区", prop: 'recommendLocationArea' },
+  // { label: "实际库区", prop: 'handledLocationArea' },
+  // { label: "推荐计量单位", prop: 'recommendUom' },
+  // { label: "实际计量单位", prop: 'handledUom' },
   // -----------------------------------------------------------------------
 ]
-// 自动发料记录 已调整
+// 自动发料记录 20230411
 export const automaticCallNote =  [
   { label: "物品代码", prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "发料数量", prop: "qty" },
   { label: "单位", prop: "uom" },
-  { label: "批次", prop: "fromLot" },
-  { label: "箱码", prop: "fromPackingCode" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "来源库位", prop: "fromLocationCode" },
   { label: "来源ERP库位", prop: 'fromLocationErpCode' },
   { label: "目标库位", prop: "toLocationCode" },
   { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "确认收料时间", prop: "arriveDate", type: "dateTime" },
-  { label: "外部单号(其他系统)", prop: 'foreignNumber' },
   { label: "在途库位", prop: 'onTheWayLocationCode' },
   // -----------------------------------------------------------------------
+  { label: "生效日期", prop: "arriveDate", type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "任务编号", prop: 'number' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
+  { label: "任务编号", prop: 'number',width: orderWidth },
   { label: "备注", prop: 'remark' },
-  { label: "仓库", prop: 'warehouseCode' },
+  { label: "来源仓库", prop: 'fromWarehouseCode' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  { label: "目标仓库", prop: 'toWarehouseCode' },
   { label: "标包数量", prop: 'stdPackQty' },
   { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
@@ -717,19 +807,47 @@ export const automaticCallNote =  [
   { label: "目标批次", prop: 'toLot' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "生产时间", prop: 'produceDate', type: "dateTime" },
-  { label: "过期时间", prop: 'expireDate', type: "dateTime" },
+  { label: "过期日期", prop: 'expireDate', type: "dateTime" },
   { label: "来源库位组", prop: 'fromLocationGroup' },
   { label: "目标库位组", prop: 'toLocationGroup' },
   { label: "来源库区", prop: 'fromLocationArea' },
   { label: "目标库区", prop: 'toLocationArea' },
-  { label: "来源仓库", prop: 'fromWarehouseCode' },
+  { label: "推荐箱码", prop: "recommendPackingCode" },
-  { label: "目标仓库", prop: 'toWarehouseCode' },
   { label: "fromStatus", prop: 'fromStatus' },
   { label: "toStatus", prop: 'toStatus' },
   { label: "发料时间", prop: 'issueTime', type: "dateTime" },
-  { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
   { label: "生产线", prop: 'prodLine' },
   { label: "工作中心", prop: 'workStation' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "推荐数量", prop: 'recommendQty' },
+  { label: "实际批次", prop: "handledLot" },
+  { label: "实际库位", prop: 'handledFromLocationCode' },
+  { label: "实际区域", prop: 'handledFromLocationArea' },
+  { label: "实际分组", prop: 'handledFromLocationGroup' },
+  { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
+  { label: "实际仓库", prop: 'handledFromWarehouseCode' },
+  { label: "推荐库位", prop: 'recommendFromLocationCode' },
+  { label: "推荐区域", prop: 'recommendFromLocationArea' },
+  { label: "推荐分组", prop: 'recommendFromLocationGroup' },
+  { label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
+  { label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
+  { label: "实际数量", prop: 'handledQty' },
+  { label: "实际箱码", prop: "handledPackingCode" },
+  { label: "推荐批次", prop: "recommendLot" },
+  { label: "推荐供应商批次", prop: 'recommendSupplierBatch' },
+  { label: "实际供应商批次", prop: 'handledSupplierBatch' },
+  { label: "推荐到货时间", prop: 'recommendArriveDate', type: "dateTime" },
+  { label: "实际到货时间", prop: 'handledArriveDate', type: "dateTime" },
+  { label: "推荐生产时间", prop: 'recommendProduceDate', type: "dateTime" },
+  { label: "实际生产时间", prop: 'handledProduceDate', type: "dateTime" },
+  { label: "推荐过期时间", prop: 'recommendExpireDate', type: "dateTime" },
+  { label: "实际过期时间", prop: 'handledExpireDate', type: "dateTime" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "过期时间", prop: 'expiredTime', type: "dateTime" },
+  // { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
 ]
 // 上架前退货记录 已调整

fe/PC/src/utils/tableColumns/index.js

@@ -1614,7 +1614,7 @@ export const PutawayNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 人工叫料申请 已调整
+// 人工叫料申请 20230411
 export const IssueRequest =  [
   {
     label: "叫料申请编号",
@@ -1625,12 +1625,13 @@ export const IssueRequest =  [
   },
   { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@@ -1641,9 +1642,12 @@ export const IssueRequest =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 人工发料任务  已调整
+// 人工发料任务  20230411
 export const IssueJob =  [
   {
     label: "发料任务编号",
@@ -1655,12 +1659,14 @@ export const IssueJob =  [
   { label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
   { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "完成时间", prop: "completeTime", type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType' },
@@ -1673,15 +1679,16 @@ export const IssueJob =  [
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
   { label: "完成者", prop: 'completeUserId' },
   { label: "完成者用户名", prop: 'completeUserName' },
-  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "公司", prop: 'company' },
+  // { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 人工发料记录 已调整
+// 人工发料记录 20230411
 export const IssueNote =  [
   {
     label: "发料记录单号",
@@ -1693,22 +1700,25 @@ export const IssueNote =  [
   { label: "申请单号", prop: 'requestNumber',width: orderWidth },
   { label: "任务单号", prop: 'jobNumber',width: orderWidth },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "完成时间", prop: "completeTime",type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "生效日期", prop: 'activeDate',type: "dateTime" },
   { label: "车间", prop: 'workshop' },
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   { label: "确认时间", prop: 'confirmTime' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "完成时间", prop: "completeTime",type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 自动叫料申请 已调整
+// 自动叫料申请 20230411
 export const automaticCallApply =  [
   {
     label: "叫料申请编号",
@@ -1719,12 +1729,13 @@ export const automaticCallApply =  [
   },
   { label: "状态", prop: "requestStatus", type: "tagFilter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "操作员", prop: "worker" },
+  { label: "备注", prop: 'remark' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
@@ -1735,9 +1746,12 @@ export const automaticCallApply =  [
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 自动发料任务 已调整
+// 自动发料任务 20230411
 export const automaticCallJob =  [
   {
     label: "发料任务编号",
@@ -1749,14 +1763,16 @@ export const automaticCallJob =  [
   { label: "申请单号", prop: "materialRequestNumber",width: orderWidth },
   { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "完成时间", prop: "completeTime", type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "上游任务编号", prop: 'upStreamJobNumber',width: orderWidth },
+  { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: 'jobType' },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
@@ -1767,15 +1783,16 @@ export const automaticCallJob =  [
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
   { label: "完成者", prop: 'completeUserId' },
   { label: "完成者用户名", prop: 'completeUserName' },
-  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
+  // { label: "公司", prop: 'company' },
+  // { label: "完成时间", prop: 'completeTime', type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
-// 自动发料记录 已调整
+// 自动发料记录 20230411
 export const automaticCallNote =  [
   {
     label: "发料记录单号",
@@ -1787,18 +1804,22 @@ export const automaticCallNote =  [
   { label: "申请单号", prop: 'requestNumber',width: orderWidth },
   { label: "任务单号", prop: 'jobNumber',width: orderWidth },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "公司", prop: 'company' },
+  { label: "生效日期", prop: 'activeDate',type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
-  { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   { label: "确认时间", prop: 'confirmTime' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "完成时间", prop: "completeTime",type: "dateTime" },
   // -----------------------------------------------------------------------
 ]
 // 上架前退货记录 已调整

fe/PC/src/utils/tabsDesTions/index.js

@@ -1101,13 +1101,14 @@ export const PutawayNote =  [
   // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 人工叫料申请 已调整 20221220
+// 人工叫料申请 20230411
 export const IssueRequest =  [
   { label: "申请编号", prop: "number" },
   { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "操作员", prop: "worker" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { 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" },
@@ -1118,18 +1119,17 @@ export const IssueRequest =  [
   // -----------------------------------------------------------------------
   { label: "备注", prop: 'remark' },
   { label: "创建者ID", prop: "creatorId" },
-  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "备料计划单号", prop: 'preparationPlanNumber' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 人工发料任务 已调整 20221220
+// 人工发料任务 20230411
 export const IssueJob = [
   { label: "发料任务编号", prop: "number" },
   { label: "申请单号", prop: "materialRequestNumber" },
@@ -1161,10 +1161,10 @@ export const IssueJob = [
   { label: "车间", prop: 'workshop' },
   { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 人工发料记录 已调整 20221220
+// 人工发料记录 20230411
 export const IssueNote =  [
   { label: "发料记录单号", prop: "number" },
   { label: "申请单号", prop: 'requestNumber' },
@@ -1183,18 +1183,19 @@ export const IssueNote =  [
   { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "确认时间", prop: 'confirmTime' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
-// 自动叫料申请 已调整 1apifox
+// 自动叫料申请 20230411
 export const automaticCallApply =  [
-  { label: "叫料申请编号", prop: "number" },
+  { label: "申请编号", prop: "number" },
   { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "操作员", prop: "worker" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { 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" },
@@ -1203,23 +1204,22 @@ export const automaticCallApply =  [
   { label: "叫料类型", prop: 'type' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者ID", prop: "creatorId" },
-  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "事务ID", prop: "tenantId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
   { label: "备料计划单号", prop: 'preparationPlanNumber' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 自动发料任务 已调整 1apifox
+// 自动发料任务 20230411
 export const automaticCallJob =  [
-  { label: "发料任务编号", prop: 'number' },
+  { label: "发料任务编号", prop: "number" },
-  { label: "申请单号", prop: 'materialRequestNumber' },
+  { label: "申请单号", prop: "materialRequestNumber" },
   { label: "状态", prop: "jobStatus", type: "filter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
@@ -1227,31 +1227,31 @@ export const automaticCallJob =  [
   { label: "承接用户", prop: 'acceptUserName' },
   { label: "承接时间", prop: 'acceptTime', type: "dateTime" },
   { label: "完成用户", prop: 'completeUserName' },
-  { label: "完成时间", prop: 'completeTime', type: "dateTime" },
+  { label: "完成时间", prop: "completeTime", type: "dateTime" },
   { label: "叫料请求类型", prop: 'requestType' },
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
-  { label: "事务ID", prop: "tenantId" },
+  { label: "上游任务编号", prop: 'upStreamJobNumber',},
-  { label: "上游任务编号", prop: 'upStreamJobNumber' },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
   { label: "优先级", prop: 'priority' },
   { label: "优先级增量", prop: 'priorityIncrement' },
+  { label: "事务ID", prop: "tenantId" },
   { label: "工作组", prop: 'workGroupCode' },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "承接者ID", prop: 'acceptUserId' },
   { label: "完成者ID", prop: 'completeUserId' },
   { label: "任务描述", prop: 'jobDescription' },
   { label: "生产线", prop: 'prodLine' },
   { label: "车间", prop: 'workshop' },
   { label: "仓库", prop: 'warehouseCode' },
-  { label: "ID", prop: 'id' },
+  { label: "ID", prop: "id" },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 自动发料记录 已调整 1apifox
+// 自动发料记录 20230411
 export const automaticCallNote =  [
   { label: "发料记录单号", prop: "number" },
   { label: "申请单号", prop: 'requestNumber' },
@@ -1262,17 +1262,17 @@ export const automaticCallNote =  [
   { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" },
   { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
-  { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
+  { label: "创建者ID", prop: "creatorId" },
   { label: "备注", prop: 'remark' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "公司", prop: 'company' },
   { label: "生效日期", prop: 'activeDate' },
   { label: "车间", prop: 'workshop' },
   { label: "确认时间", prop: 'confirmTime' },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 上架前退货记录 已调整 1

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue

@@ -98,7 +98,7 @@ export default {
   },
   data () {
     return {
-      URL: 'wms/job/issue-job',
+      URL: 'wms/store/issue-job',
       tableLoading: false,
       handleMultipleSelection: [],
       //常用按钮数据
@@ -246,7 +246,7 @@ export default {
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
       let params = {
-        type: 'Issue_WIP'
+        requestType: 'Issue_WIP'
       }
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
         .then(res => {

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallNote.vue

@@ -93,7 +93,7 @@ export default {
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
       let params = {
-        type: 'Issue_WIP'
+        requestType: 'Issue_WIP'
       }
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
         .then(res => {

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@@ -98,7 +98,7 @@ export default {
   },
   data () {
     return {
-      URL: 'wms/job/issue-job',
+      URL: 'wms/store/issue-job',
       tableLoading: false,
       handleMultipleSelection: [],
       //常用按钮数据
@@ -248,7 +248,7 @@ export default {
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
       let params = {
-        type: 'Issue_Manual'
+        requestType: 'Issue_Manual'
       }
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params)
         .then(res => {

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueNote.vue

@@ -93,7 +93,7 @@ export default {
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
       // 叫料请求类型: 人工拉动:Issue_Manual;  线边拉动:Issue_WIP; 直接发料:Direct_Issue
       let params = {
-        type: 'Issue_Manual'
+        requestType: 'Issue_Manual'
       }
       materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
           this.tableData = res.items

fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue

@@ -30,9 +30,9 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledMethod = {method1:true,method2:false,method3:true}
       :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
-      methodValue="0"
+      methodValue="1"
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
@@ -43,7 +43,7 @@
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
-      :Butttondata="[]"
+      :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
       @drawerbutton="drawerbutton"
       @handleCommand="drawerHandle"
@@ -65,6 +65,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
+import { processRequest, getDetailed } from '@/api/wms-api'
 export default {
   name: "PurchaseOrder",
   mixins: [
@@ -77,6 +78,16 @@ export default {
   data () {
     return {
       URL: 'wms/store/purchase-order',
+      DrawerButtonData: [
+        {
+          type: 'danger',
+          icon: 'el-icon-delete-solid',
+          label: '作废',
+          hide: false,
+          name: "delete",
+          size: 'mini'
+        },
+      ],
       //常用按钮数据
       currenButtonData: [
         this.defaultImportBtn(),//导入
@@ -90,6 +101,27 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    //抽屉内常用按钮
+    drawerbutton (val) {
+      // 作废
+      if (val == 'delete') {
+        let that = this
+        that.Loading.appMainLoading = true
+        processRequest(that.propsData.id, that.URL + '/cancel/').then(res => {
+          that.$successMsg('已作废')
+          getDetailed(that.propsData.id, that.URL).then(res => {
+            that.propsData = res
+          })
+          that.paging()
+          that.Loading.appMainLoading = false
+        }).catch(err => {
+          console.log(err)
+          that.Loading.appMainLoading = false
+        })
+      }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>