From 29dd55007ee670263dba3315ddb38080ef514f44 Mon Sep 17 00:00:00 2001
From: 10001392 <1055202292@qq.com>
Date: Wed, 3 Jun 2026 18:07:02 +0800
Subject: [PATCH] =?UTF-8?q?1551=20=E6=9D=A1=E7=A0=81=E5=88=B6=E4=BD=9C-?=
 =?UTF-8?q?=E9=92=A2=E7=BB=93=E6=9E=84=E9=A1=B5=E9=9D=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=89=93=E5=8C=85=E5=92=8C=E6=9C=AA=E6=89=93?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StructuralPackageOrderController.java     |  22 ++++++++++++++++--
 .../template/钢构包送货单模版.xlsx    | Bin 12343 -> 12337 bytes
 .../vo/DeliverStructuralPackageOrderVO.java   |   5 ++++
 .../entity/WmsStructuralPackageOrder.java     |   5 ++++
 .../WmsStructuralPackageOrderTrayMapper.xml   |   2 +-
 5 files changed, 31 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 a4770f66..f1c7ac21 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
@@ -323,6 +323,7 @@ public class StructuralPackageOrderController extends BaseController {
                 order.setId(IdUtil.getSnowflakeNextId());
                 order.setCreateBy(UserUtil.getUserName());
                 order.setCreateTime(LocalDateTime.now());
+                order.setState(OrderState.Unpackaged.getState()); // 初始化订单状态为未打包
                 ordersForAdd.add(order);
             } else {
                 order.setUpdateBy(UserUtil.getUserName());
@@ -1071,8 +1072,13 @@ public class StructuralPackageOrderController extends BaseController {
         info.put("today", DateTimeUtil.format(LocalDate.now()));
         List<DeliverStructuralPackageOrderForPackageItemVO> datas = structuralPackageOrderService.getInfoByDeliverOrderNo(deliverOrder.getNo());
         datas.forEach(it -> {
+            // 只统计已打包的托盘数量（状态为1：已打包、2：在途、3：已收货）
             it.setTrayNum(Math.toIntExact(structuralPackageOrderTrayService.lambdaQuery()
                     .eq(WmsStructuralPackageOrderTray::getOrderId, it.getId())
+                    .in(WmsStructuralPackageOrderTray::getState, 
+                        OrderState.Packaged.getState(), 
+                        OrderState.InTransit.getState(), 
+                        OrderState.Received.getState())
                     .count()));
         });
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
@@ -1818,7 +1824,13 @@ public class StructuralPackageOrderController extends BaseController {
         // 10. 保存二维码扫描记录
         saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1);
 
-        // 11. 构建返回结果
+        // 11. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包）
+        structuralPackageOrderService.lambdaUpdate()
+                .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState())
+                .eq(WmsStructuralPackageOrder::getId, orderId)
+                .update();
+
+        // 12. 构建返回结果
         PackTraySubmitResultVO result = new PackTraySubmitResultVO();
         result.setHasDiff(false);
         result.setDiffList(new ArrayList<>());
@@ -1981,7 +1993,13 @@ public class StructuralPackageOrderController extends BaseController {
         // 8. 保存二维码扫描记录
         saveMaterialQrCodeScanRecord(allQrCodeDTOs, 1);
 
-        // 9. 构建返回结果
+        // 9. 直接更新订单状态为已打包（特殊需求：不需要所有托盘都打包）
+        structuralPackageOrderService.lambdaUpdate()
+                .set(WmsStructuralPackageOrder::getState, OrderState.Packaged.getState())
+                .eq(WmsStructuralPackageOrder::getId, orderId)
+                .update();
+
+        // 10. 构建返回结果
         PackTraySubmitWithDiffVO result = new PackTraySubmitWithDiffVO();
         result.setOrderId(request.getOrderId());
 
diff --git a/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx b/nflg-wms-admin/src/main/resources/template/钢构包送货单模版.xlsx
index f3519328284946bdf48cc6148e13bb6d9670d00f..2b1f7508d5b31c2899e6839c09b1019ce4c31b2e 100644
GIT binary patch
delta 3719
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
Yz=ZfrjTmT-K_E`r%S20sM~*)FKLehxSO5S3

delta 3771
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

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 513550d4..845b0014 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
@@ -181,4 +181,9 @@ public class DeliverStructuralPackageOrderVO {
      */
     @ExcelColumn(value = "ECO", colIndex = 13)
     private String eco;
+
+    /**
+     * 状态，0：未打包；1：已打包；2-在途；3-已收货
+     */
+    private Short state;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
index fd45a3f2..dfd052f5 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStructuralPackageOrder.java
@@ -131,4 +131,9 @@ public class WmsStructuralPackageOrder implements Serializable {
      * ECO（从钢构件基础信息获取）
      */
     private String eco;
+
+    /**
+     * 状态，0：未打包；1：已打包；2-在途；3-已收货
+     */
+    private Short state;
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
index 3394c6ca..c20a26de 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderTrayMapper.xml
@@ -15,7 +15,7 @@
         left join wms_structural_package_deliver_order_map spdom on o.id=spdom.order_id
         where 1=1
         <if test="request.state!=null">
-            and exists (select 1 from wms_structural_package_order_tray ot where ot.order_id=o.id and ot.state=#{request.state})
+            and o.state=#{request.state}
         </if>
         <if test="request.orderNo!=null and request.orderNo!=''">
             and o.order_no=#{request.orderNo}