From 40d8de59b61811a6a62e08002d04b847f49b01f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 10 Oct 2025 10:14:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug-784=20=E9=92=A2=E6=9E=84=E5=8C=85?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E7=BC=BA=E4=BB=B6=E4=BA=A4?=
 =?UTF-8?q?=E8=B4=A7=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StructuralPackageOrderController.java      | 7 +++++++
 .../common/pojo/vo/DeliverStructuralPackageOrderVO.java   | 5 +++++
 .../mapper/WmsStructuralPackageDeliverOrderMapper.xml     | 8 ++++++--
 .../resources/mapper/WmsStructuralPackageOrderMapper.xml  | 2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
index 98d06e78..6ffe88b8 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
@@ -561,6 +561,13 @@ public class StructuralPackageOrderController extends BaseController {
                 .eq(WmsStructuralPackageOrderTray::getState, OrderState.Unpackaged.getState())
                 .eq(WmsStructuralPackageOrderTray::getNo, request.getTrayNo())
                 .update()).throwMessage("打包失败，请重试");
+        deliverStructuralPackageOrderTrayItemService.updateBatchById(trayItems);
+        if (trayItems.stream().anyMatch(it -> Objects.nonNull(it.getOfflineReceived()))) {
+            deliverStructuralPackageOrderService.lambdaUpdate()
+                    .set(WmsStructuralPackageOrder::getQuehuo, true)
+                    .eq(WmsStructuralPackageOrder::getId, tray.getOrderId())
+                    .update();
+        }
         saveMaterialQrCodeScanRecord(qrCodeDTOs, 1);
         return ApiResult.success();
     }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
index 3511da8c..70352f8b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderVO.java
@@ -159,4 +159,9 @@ public class DeliverStructuralPackageOrderVO {
      * 送货单id
      */
     private Long deliverId;
+
+    /**
+     * 是否存在缺货零件
+     */
+    private Boolean quehuo;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
index 8f1f5f20..f731820f 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageDeliverOrderMapper.xml
@@ -3,9 +3,13 @@
 <mapper namespace="com.nflg.wms.repository.mapper.WmsStructuralPackageDeliverOrderMapper">
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.StructuralPackageDeliverOrderVO">
-        select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",spo.quehuo
+        select pdo.*, us.supplier_code, us.supplier_name,di."name" AS "factory_no",EXISTS(
+            SELECT 1
+            FROM wms_structural_package_deliver_order_map pdom
+            INNER JOIN wms_structural_package_order spo on pdom.order_id=spo.id
+            WHERE spo.quehuo AND pdom.deliver_id=pdo.id
+        ) AS quehuo
         from wms_structural_package_deliver_order pdo
-        inner join wms_structural_package_order spo on pdo.id=spo.deliver_id
         inner join user_supplier us on pdo.supplier_id=us.id
         LEFT JOIN dictionary_item di ON pdo.factory_id=di."id"
         <where>
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
index ead1d516..77be5f0a 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml
@@ -4,7 +4,7 @@
 
     <select id="search" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderVO">
         SELECT o.*,m."no"||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
-        ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo"
+        ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",sp.drawing_no as "packageDrawingNo",o.quehuo
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id