Merge branch 'develop' into dev_zhangke

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

@@ -206,6 +206,7 @@ public class OutAssistanceController extends BaseController {
         request.getQrCodes().forEach(qrCode -> {
             MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
             BigDecimal qrNum = qrCode.getNum();
+            qrCodeContent.setNum(qrNum);
             String materialNo = qrCodeContent.getMaterialNo();
             dtos.add(qrCodeContent);
             WmsOutAssistanceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);

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

@@ -201,6 +201,7 @@ public class OutCostCenterController extends BaseController {
         request.getQrCodes().forEach(qrCode -> {
             MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
             BigDecimal qrNum = qrCode.getNum();
+            qrCodeContent.setNum(qrNum);
             String materialNo = qrCodeContent.getMaterialNo();
             dtos.add(qrCodeContent);
             WmsOutCostcenterItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);

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

@@ -311,6 +311,7 @@ public class OutProduceController extends BaseController {
             MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
             String materialNo = qrCodeContent.getMaterialNo();
             BigDecimal qrNum = qrCode.getNum();
+            qrCodeContent.setNum(qrNum);
             dtos.add(qrCodeContent);
             WmsOutProduceItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
             VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要领料");

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

@@ -129,7 +129,7 @@ public class OutPurchaseController extends BaseController {
                             .setUniqNo(dto.getUniqNo())
                             .setFactoryNo(item.getWerks())
                             .setWarehouseNo(item.getLgort())
-                            .setNum(dto.getNum())
+                            .setNum(qrCode.getNum())
                             .setUnit(it.getMeins())
                             .setEbeln(order.getEbeln())
                             .setEbeln(it.getEbelp())

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

@@ -233,6 +233,7 @@ public class TransferCompanyController extends BaseController {
         request.getQrCodes().forEach(qrCode -> {
             MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
             BigDecimal qrNum = qrCode.getNum();
+            qrCodeContent.setNum(qrNum);
             String materialNo = qrCodeContent.getMaterialNo();
             WmsTransferCompanyItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
             VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");

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

@@ -232,6 +232,7 @@ public class TransferFactoryController extends BaseController {
         request.getQrCodes().forEach(qrCode -> {
             MaterialQRCodeContentDTO qrCodeContent = NoUtil.getMaterialQRCodeContent(qrCode.getContent());
             BigDecimal qrNum = qrCode.getNum();
+            qrCodeContent.setNum(qrNum);
             String materialNo = qrCodeContent.getMaterialNo();
             WmsTransferFactoryItem item = datas.stream().filter(d -> Objects.equals(d.getId(), qrCode.getItemId())).findFirst().orElse(null);
             VUtil.trueThrowBusinessError(Objects.isNull(item)).throwMessage("物料" + materialNo + "不需要出库");

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;
+
 
     /**
      * 装箱单明细