修改装配报工打印标签查询条件

src/api/wms/package/index.ts

@@ -112,6 +112,12 @@ export const getLabelDetailPage = async (params) => {
   return await request.get({ url: `/wms/package/getLabelDetailPage`,params})
 }
 
+// 打印标签获取包装列表(装配报工专用)
+
+export const getProductreceiptLabelDetailPage = async (params) => {
+  return await request.get({ url: `/wms/package/getProductreceiptLabelDetailPage`,params})
+}
+
 // 根据库存余额获取包装信息进行打印标签
 export const getBalanceToPackage = async (packingNumber: String) => {
   return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber})

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -116,23 +116,23 @@ const { tableObject, tableMethods } = useTable({
  */
  if ( routeName.value == 'OktoholdRequestMain') {
   tableObject.params = {
-    fromInventoryStatus: 'OK',
     toInventoryStatus:'HOLD'
   }
-  fromInventoryStatus.value = 'OK'
   toInventoryStatus.value = "HOLD"
   businessType.value = 'OkToHold'
-  importFileName.value = '合格转隔离申请'
+  importFileName.value = '物料转隔离申请'
-}else if ( routeName.value == 'NoktoholdRequestMain') {
+}
-  tableObject.params = {
+// else if ( routeName.value == 'NoktoholdRequestMain') {
-    fromInventoryStatus: 'NOK',
+//   tableObject.params = {
-    toInventoryStatus:'HOLD'
+//     fromInventoryStatus: 'NOK',
-  }
+//     toInventoryStatus:'HOLD'
-  fromInventoryStatus.value = 'NOK'
+//   }
-  toInventoryStatus.value = "HOLD"
+//   fromInventoryStatus.value = 'NOK'
-  businessType.value = 'NokToHold'
+//   toInventoryStatus.value = "HOLD"
-  importFileName.value = '不合格转隔离申请'
+//   businessType.value = 'NokToHold'
-} else if ( routeName.value == 'HoldtookRequestMain') {
+//   importFileName.value = '不合格转隔离申请'
+// }
+ else if ( routeName.value == 'HoldtookRequestMain') {
   tableObject.params = {
     fromInventoryStatus: 'HOLD',
     toInventoryStatus:'OK'
@@ -159,16 +159,18 @@ const { tableObject, tableMethods } = useTable({
   toInventoryStatus.value = "SCRAP"
   businessType.value = 'OkToScrap'
   importFileName.value = '合格转报废申请'
-} else if ( routeName.value == 'ScraptoholdRequestMain') {
-  tableObject.params = {
-    fromInventoryStatus: 'SCRAP',
-    toInventoryStatus:'HOLD'
 } 
-  fromInventoryStatus.value = 'SCRAP'
+// else if ( routeName.value == 'ScraptoholdRequestMain') {
-  toInventoryStatus.value = "HOLD"
+//   tableObject.params = {
-  businessType.value = 'ScrapToHold'
+//     fromInventoryStatus: 'SCRAP',
-  importFileName.value = '报废转隔离申请'
+//     toInventoryStatus:'HOLD'
-} else if( routeName.value == 'InventorymoveRequestMain'){
+//   }
+//   fromInventoryStatus.value = 'SCRAP'
+//   toInventoryStatus.value = "HOLD"
+//   businessType.value = 'ScrapToHold'
+//   importFileName.value = '报废转隔离申请'
+// } 
+else if( routeName.value == 'InventorymoveRequestMain'){
   fromInventoryStatus.value = null
   businessType.value = 'Move'
   importFileName.value = '库存移动申请'
@@ -639,7 +641,7 @@ const handleExport = async () => {
     exportLoading.value = true
     if(routeName.value == 'OktoholdRequestMain'){
       const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
-      download.excel(data, '合格转隔离申请主.xlsx')
+      download.excel(data, '物料转隔离申请主.xlsx')
         }else if ( routeName.value == 'HoldtookRequestMain') {
           const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
           download.excel(data, '隔离转合格申请主.xlsx')
@@ -649,10 +651,12 @@ const handleExport = async () => {
         }else if ( routeName.value == 'OktoscrapRequestMain') {
           const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
           download.excel(data, '合格转报废申请主.xlsx')
-        }else if ( routeName.value == 'ScraptoholdRequestMain') {
+        }
-          const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
+        // else if ( routeName.value == 'ScraptoholdRequestMain') {
-          download.excel(data, '报废转隔离申请主.xlsx')
+        //   const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
-        }else{
+        //   download.excel(data, '报废转隔离申请主.xlsx')
+        // }
+        else{
           const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
           download.excel(data, '库存转移申请主.xlsx')
         }

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -277,11 +277,12 @@ const handleCreatePutawayRequest = async (number:string) => {
 const searchTableRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const labelPrint = async (row) => {
-
+  console.log(7777,row);
   tableObject.loading = true
   //获取类型
   let resType = await PackageApi.getPackagePage({
-    requestNumber: row.requestNumber==null?row.number:row.requestNumber
+    requestNumber: row.requestNumber==null?row.number:row.requestNumber,
+    number: row.packingNumber==null?row.number:row.packingNumber
   })
   if(resType.list.length > 0) {
     if (resType.list[0].productionLineCode != null) {
@@ -290,10 +291,10 @@ const labelPrint = async (row) => {
       labelType.value = 'cg'
     }
   }
-  const defaultParams = {'moduleName':'productreceipt_assemble','recordNumber':row.requestNumber==null?row.number:row.requestNumber}
+  const defaultParams = {'moduleName':'productreceipt_assemble','recordNumber':row.requestNumber==null?row.number:row.requestNumber,'number':row.number==null?row.number:row.packingNumber }
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
-    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+    getListApi: PackageApi.getProductreceiptLabelDetailPage  // 分页接口
   })
 
   // 获得表格的各种操作