Merge remote-tracking branch 'origin/master-hlq20260506ganggoubao' into develop

# Conflicts:
#	nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java

@@ -1714,11 +1714,10 @@ public class StructuralPackageOrderController extends BaseController {
     @Transactional
     @PostMapping("/packTraySubmit")
     public ApiResult<PackTraySubmitResultVO> packTraySubmit(@Valid @RequestBody @NotNull PackTraySubmitQO request) {
-        // 1. 根据orderNo查询订单信息
+        // 1. 根据orderId查询订单信息
-        List<DeliverStructuralPackageOrderVO> orders = structuralPackageOrderService.getList(request.getOrderNo());
+        DeliverStructuralPackageOrderVO order = structuralPackageOrderService.getInfo(request.getOrderId());
-        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("订单不存在");
+        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
 
-        DeliverStructuralPackageOrderVO order = orders.get(0);
         Long orderId = order.getId();
 
         // 2. 获取该订单下的所有托盘项（用于对比计划数量和实际数量）
@@ -1877,11 +1876,10 @@ public class StructuralPackageOrderController extends BaseController {
                     .throwMessage("物料" + diffItem.getMaterialNo() + "的差异原因不能为空");
         }
         
-        // 2. 根据orderNo查询订单信息
+        // 2. 根据orderId查询订单信息
-        List<DeliverStructuralPackageOrderVO> orders = structuralPackageOrderService.getList(request.getOrderNo());
+        DeliverStructuralPackageOrderVO order = structuralPackageOrderService.getInfo(request.getOrderId());
-        VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("订单不存在");
+        VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
 
-        DeliverStructuralPackageOrderVO order = orders.get(0);
         Long orderId = order.getId();
 
         // 3. 获取该订单下的所有托盘
@@ -2005,14 +2003,14 @@ public class StructuralPackageOrderController extends BaseController {
 
         // 9. 构建返回结果
         PackTraySubmitWithDiffVO result = new PackTraySubmitWithDiffVO();
-        result.setOrderNo(request.getOrderNo());
+        result.setOrderId(request.getOrderId());
         
         // 转换托盘列表
         List<TrayItemVO2> trayVOs = new ArrayList<>();
         for (TraySubmitQO trayQO : request.getTrays()) {
             TrayItemVO2 trayVO = new TrayItemVO2();
             trayVO.setTrayNo(trayQO.getTrayNo());
-            trayVO.setOrderNo(trayQO.getOrderNo());
+            trayVO.setOrderId(trayQO.getOrderId());
             
             List<TrayMaterialVO> materialVOs = new ArrayList<>();
             for (TrayMaterialQO materialQO : trayQO.getItems()) {

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackTraySubmitQO.java

@@ -1,8 +1,8 @@
 package com.nflg.wms.common.pojo.qo;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,10 +17,10 @@ public class PackTraySubmitQO implements Serializable {
     private static final long serialVersionUID = 1L;
     
     /**
-     * 采购单号/钢构件订单号
+     * 订单ID
      */
-    @NotBlank(message = "订单号不能为空")
+    @NotNull(message = "订单ID不能为空")
-    private String orderNo;
+    private Long orderId;
     
     /**
      * 托盘列表

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackTraySubmitWithDiffQO.java

@@ -1,8 +1,8 @@
 package com.nflg.wms.common.pojo.qo;
 
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,10 +17,10 @@ public class PackTraySubmitWithDiffQO implements Serializable {
     private static final long serialVersionUID = 1L;
     
     /**
-     * 采购单号/钢构件订单号
+     * 订单ID
      */
-    @NotBlank(message = "订单号不能为空")
+    @NotNull(message = "订单ID不能为空")
-    private String orderNo;
+    private Long orderId;
     
     /**
      * 托盘列表

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TraySubmitQO.java

@@ -3,6 +3,7 @@ package com.nflg.wms.common.pojo.qo;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -23,10 +24,10 @@ public class TraySubmitQO implements Serializable {
     private String trayNo;
     
     /**
-     * 订单号
+     * 订单ID
      */
-    @NotBlank(message = "订单号不能为空")
+    @NotNull(message = "订单ID不能为空")
-    private String orderNo;
+    private Long orderId;
     
     /**
      * 托盘内物料明细

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackTraySubmitWithDiffVO.java

@@ -13,9 +13,9 @@ public class PackTraySubmitWithDiffVO implements Serializable {
     private static final long serialVersionUID = 1L;
     
     /**
-     * 采购单号/钢构件订单号
+     * 订单ID
      */
-    private String orderNo;
+    private Long orderId;
     
     /**
      * 托盘列表

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TrayItemVO2.java

@@ -19,9 +19,9 @@ public class TrayItemVO2 implements Serializable {
     private String trayNo;
 
     /**
-     * 订单号
+     * 订单ID
      */
-    private String orderNo;
+    private Long orderId;
 
     /**
      * 托盘内物料明细