Merge remote-tracking branch '惠信/dev_zhangke' into develop

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/ComponentPackingControllerService.java

@@ -105,6 +105,8 @@ public class ComponentPackingControllerService {
         wmsComponentPacking.setZjshz(request.getZjshz());
         wmsComponentPacking.setZchep(request.getZchep());
         wmsComponentPacking.setTelNumber(request.getTelNumber());
+        wmsComponentPacking.setGStreen(request.getGstreen());
+        wmsComponentPacking.setGStrSuppl2(request.getGstrSuppl2());
         //修改自己集合
         List<WmsComponentPackingItem> wmsComponentPackingItems = wmsComponentPackingItemService
                 .lambdaQuery()

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

@@ -48,6 +48,16 @@ public class ComponentPackingEditInputQO {
      */
     private String telNumber;
 
+    /**
+     * 收货地址-T
+     */
+    private String gstreen;
+
+    /**
+     * 收货人电话-
+     */
+    private String gstrSuppl2;
+
 
     /**
      * 装箱单明细

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

@@ -1,6 +1,5 @@
 package com.nflg.wms.common.pojo.qo;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -16,6 +15,5 @@ public class InSubmitItemQO {
     /**
      * 入库储位编号列表
      */
-    @NotBlank
     private String binNos;
 }