1551 条码制作-钢结构页面订单表加状态字段，区分打包和未打包

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());
 

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;
 }

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;
 }

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}