From 636b3755cca88023902839d57779ace378f500fb Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 19 Sep 2025 18:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8E=A5=E6=94=B6=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/po/po.js                |  2 ++
 src/views/modules/recv/recv.vue | 33 ++++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/api/po/po.js b/src/api/po/po.js
index 5dd545e..3eef318 100644
--- a/src/api/po/po.js
+++ b/src/api/po/po.js
@@ -7,6 +7,8 @@ export const getPoList = data => createAPI(`po/getPoList`,'post',data)
 // 接收采购单信息
 export const receivePo = data => createAPI(`po/receivePo`,'post',data)
 
+// 获取下一个itemNo
+export const getNextItemNo = data => createAPI(`po/getNextItemNo`,'post',data)
 
 // 获取待检验入库单列表
 export const getQualifiedInspectionList = data => createAPI(`inspection/getQualifiedInspectionList`,'post',data)
diff --git a/src/views/modules/recv/recv.vue b/src/views/modules/recv/recv.vue
index caf1307..b95f4f7 100644
--- a/src/views/modules/recv/recv.vue
+++ b/src/views/modules/recv/recv.vue
@@ -130,7 +130,7 @@
 </template>
 
 <script>
-import { getPoList, receivePo,printLabel } from "@/api/po/po.js";
+import { getPoList, receivePo, printLabel, getNextItemNo } from "@/api/po/po.js";
 
 export default {
   data() {
@@ -189,7 +189,7 @@ export default {
         }
       });
     },
-    recvLine(row) {
+    async recvLine(row) {
      /* if (row.receiveCaseDB!='INVDIR' && row.receiveCaseDB!='QAINV') {
         return this.$message.warning("该采购订单行的收货方式为"+row.receiveCase+"，无法接收");
       }*/
@@ -199,12 +199,30 @@ export default {
       if (row.status === 'Stopped' || row.status === 'Closed' || row.status === 'Cancelled') {
         return this.$message.warning("该采购订单行状态为"+row.status+"，无法接收");
       }
+
+      // 获取下一个itemNo
+      let nextItemNo = 1;
+      try {
+        const { data } = await getNextItemNo({
+          orderNo: row.orderNo,
+          lineNo: row.lineNo,
+          releaseNo: row.releaseNo || ''
+        });
+        if (data.code === 0) {
+          nextItemNo = data.data;
+        }
+      } catch (error) {
+        console.error('获取itemNo失败:', error);
+        // 失败时使用默认值1
+      }
+
       this.recvItem = {
         ...row,
         poNo: row.poNumber || this.scanCode,
         dueinQty: row.qtyToReceive || row.invQtyToReceive,
         transQty: '',
-        batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+1,
+        itemNo: nextItemNo,
+        batchNo: row.partNo+'-'+row.lineNo+'-'+row.releaseNo+'-'+nextItemNo,
         deliveryDate: row.plannedDeliveryDate || '',
         arrivalDate: this.getCurrentDate(),
         supplierBatchNo: '',
@@ -270,7 +288,7 @@ export default {
         transQty: item.transQty,
         batchNo: item.batchNo,
         locationNo: item.locationNo,
-        itemNo: 1,
+        itemNo: item.itemNo,
         wdr: item.wdr || '*',
         deliveryDate: item.deliveryDate,
         arrivalDate: item.arrivalDate,
@@ -303,7 +321,7 @@ export default {
         if (data.code === 0) {
           this.$message.success("操作成功");
           this.clearAllHandlingUnitCache();
-          this.printViaServer(data.data); // 调用打印
+          this.printViaServer(data.data,item.needCheck); // 调用打印
           this.processFlag = 1;
           this.scanCode = '';
           this.poList = [];
@@ -322,7 +340,7 @@ export default {
     /**
      * 通过服务器打印
      */
-    async printViaServer(receiptNo) {
+    async printViaServer(receiptNo,needCheck) {
       this.$emit('print-start')
       try {
         const printRequest = {
@@ -334,7 +352,8 @@ export default {
           userId: localStorage.getItem('userName'),
           username: localStorage.getItem('userName'),
           site: localStorage.getItem('site'),
-          receiptNo: receiptNo
+          receiptNo: receiptNo,
+          needCheck:needCheck
         }
         const { data } = await printLabel(printRequest)
         if (data.code === 200) {