From 9850a34584ffb3609ac9eb352df99d06cabd2df0 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Mon, 7 Sep 2026 09:38:07 +0800
Subject: [PATCH] =?UTF-8?q?pc=E6=97=A0=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../noOrderIssue/newNoOrderIssueNotify54.vue    |  4 +++-
 .../haianWarehouse/shipment/shipmentIssue54.vue | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue b/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
index ad11b00..422bdf9 100644
--- a/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
+++ b/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
@@ -477,6 +477,8 @@ import {
   queryPartAttributeData,
   searchOtherPart,
 } from '@/api/haianWarehouse/noOrderIssueNotify.js'
+import { haiAnGetShipmentAndLineForIssure as getShipmentAndLineForIssure } from '@/api/haianWarehouse/shipmentIssue.js'
+import { haiAnGetShopOrderAndMaterialByShoporder as getShopOrderAndMaterialByShoporder } from '@/api/haianWarehouse/shopOrderIssueNotify.js'
 import noorderUploadExcel from '@/views/modules/noOrderIssue/noorder_upload_excel.vue'
 import baofeiUploadExcel from '@/views/modules/noOrderIssue/baofei_upload_excel.vue'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -1894,7 +1896,7 @@ export default {
 
       // 3. 准备请求参数 - rqrq
       const requestParams = {
-        site: this.$store.state.user.site,
+        site: this.$store.state.user.site+'%',
         orderNo: this.orderManageData.orderNo.trim(),
         releaseNo: this.orderManageData.releaseNo || '*',
         sequenceNo: this.orderManageData.sequenceNo || '*',
diff --git a/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue b/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
index 9582902..09e0147 100644
--- a/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
+++ b/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
@@ -2402,7 +2402,7 @@ export default {
       })
     },
       /**
-     * 销售发货单查询：IFS入参仍用大site，回传contract/site映射为subsite保存 - rqrq
+     * 销售发货单查询：site按大site+'%'模糊查IFS头，行项目按返回CONTRACT分别拉取 - rqrq
      */
     searchSOSRouting () {
       if (this.seqNoData.orderNo == null || this.seqNoData.orderNo === '') {
@@ -2423,7 +2423,12 @@ export default {
         return false
       }
       this.seqNoModalLoading = true
-      haiAnGetShipmentAndLineForIssure(this.seqNoData).then(({ data }) => {
+      // IFS Shipment头查询site需模糊：大site+'%'；行接口site由后端按CONTRACT拆分调用 - rqrq
+      const queryData = {
+        ...this.seqNoData,
+        site: (this.$store.state.user.site || '') + '%'
+      }
+      haiAnGetShipmentAndLineForIssure(queryData).then(({ data }) => {
         if (data && data.code === 0) {
           ;(data.rows || []).forEach((newRow) => {
             const inventoryQty = parseFloat(newRow.inventoryQty) || 0
@@ -2432,7 +2437,7 @@ export default {
             this.$set(newRow, 'qtyToApply', qtyToApply > 0 ? qtyToApply : 0)
             newRow.orderNo = newRow.orderNo || newRow.shipmentId
             newRow.partNo = newRow.partNo || newRow.inventoryPartNo
-            newRow.subSite = newRow.subSite || newRow.contract || newRow.site || this.$store.state.user.site
+            newRow.subSite = newRow.subSite || newRow.contract || this.$store.state.user.site
             // shipment父行按单号汇总，release/sequence固定占位，避免同单多行拆成多父记录 - rqrq
             newRow.releaseNo = '*'
             newRow.sequenceNo = '*'
@@ -2450,6 +2455,7 @@ export default {
     },
       /**
      * 海安销售发料批量保存：主单site=大site，明细subsite取IFS工厂编码 - rqrq
+     * 保存前将发料页字段映射为后端buildChildren所需字段：componentPartNo/applyQty/lineItemNo - rqrq
      */
     saveNewSoIssueNotify () {
       for (let i = 0; i < this.seqNoList.length; i++) {
@@ -2460,6 +2466,11 @@ export default {
         this.seqNoList[i].site = this.$store.state.user.site
         this.seqNoList[i].orderNo = this.seqNoList[i].orderNo || this.seqNoList[i].shipmentId
         this.seqNoList[i].partNo = this.seqNoList[i].partNo || this.seqNoList[i].inventoryPartNo
+        // 后端haiAnSaveNewSoIssueNotify只认componentPartNo/applyQty/lineItemNo，发料页原字段需显式映射 - rqrq
+        this.seqNoList[i].componentPartNo = this.seqNoList[i].componentPartNo || this.seqNoList[i].partNo || this.seqNoList[i].inventoryPartNo
+        this.seqNoList[i].applyQty = this.seqNoList[i].qtyToApply
+        // 老发料链路用shipmentLineNo写BOM_item_no，海安共用接口改为认lineItemNo - rqrq
+        this.seqNoList[i].lineItemNo = this.seqNoList[i].lineItemNo || this.seqNoList[i].shipmentLineNo
         this.seqNoList[i].subSite = this.seqNoList[i].subSite || this.seqNoList[i].contract || this.seqNoList[i].site || this.$store.state.user.site
         this.seqNoList[i].releaseNo = this.seqNoList[i].releaseNo || '*'
         this.seqNoList[i].sequenceNo = this.seqNoList[i].sequenceNo || '*'