Merge branch 'feature/bug-813' into develop

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

@@ -11,7 +11,6 @@ import com.nflg.wms.admin.util.ThymeleafUtil;
 import com.nflg.wms.common.pojo.ApiResult;
 import com.nflg.wms.common.pojo.PageData;
 import com.nflg.wms.common.pojo.dto.ZWM3A19DTO;
-import com.nflg.wms.common.pojo.dto.ZWM3A19ITEMDTO;
 import com.nflg.wms.common.pojo.qo.ComponentOrderQO;
 import com.nflg.wms.common.pojo.qo.ComponentPackingEditInputQO;
 import com.nflg.wms.common.pojo.qo.ComponentPackingInputQO;
@@ -30,10 +29,7 @@ import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -168,13 +164,15 @@ public class ComponentPackingController {
 
 
     /**
-     * 装箱单详情列表
+     * 装箱单项详情列表
      *
      * @param packingId  装箱单号或是分销凭证号
-     * @return 装箱单详情列表
+     * @return 装箱单项详情列表
      */
     @GetMapping("pda/taskitem")
     public ApiResult<List<ComponentPackingItemPdaVO>> getPackingPdaItem(@RequestParam @NotNull Long packingId) {
+        WmsComponentPacking packing = wmscomponentPackingService.getById(packingId);
+        VUtil.trueThrowBusinessError(Objects.isNull(packing)).throwMessage("装箱单不存在");
         // 查询退库单对应的明细项
         List<WmsComponentPackingItem> tasks = wmsComponentPackingItemService.lambdaQuery()
                 .select(WmsComponentPackingItem::getId, WmsComponentPackingItem::getIdnrk,
@@ -192,6 +190,9 @@ public class ComponentPackingController {
         List<ComponentPackingItemPdaVO> daVos = tasks.stream()
                 .map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item))
                 .collect(Collectors.toList());
+        daVos.forEach(vo -> {
+            vo.setFactoryNo(packing.getFactoryNo());
+        });
         return ApiResult.success(daVos);
     }
 

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

@@ -167,6 +167,7 @@ public class InCostCenterBackController extends BaseController {
                 .setId(order.getId())
                 .setAufnr(order.getAufnr())
                 .setRsnum(order.getRsnum())
+                .setFactoryNo(order.getWerks())
                 .setItems(datas.stream()
                         .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
                         .map(item -> {

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

@@ -214,6 +214,7 @@ public class InProduceBackController extends BaseController {
                 .setId(order.getId())
                 .setAufnr(order.getAufnr())
                 .setRsnum(order.getRsnum())
+                .setFactoryNo(order.getDwerk())
                 .setItems(datas.stream()
                         .filter(item -> item.getSqsl().compareTo(item.getNum()) > 0)
                         .map(item -> new OutProduceItemVO()

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

@@ -168,6 +168,7 @@ public class OutAssistanceController extends BaseController {
                 .setAufnr(order.getEbeln())
                 .setRsnum("")
                 .setLgort(order.getLgort1())
+                .setFactoryNo(order.getWerks())
                 .setItems(datas.stream()
                         .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
                         .map(item -> new OutProduceItemVO()

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

@@ -163,6 +163,7 @@ public class OutCostCenterController extends BaseController {
                 .setId(order.getId())
                 .setAufnr(order.getAufnr())
                 .setRsnum(order.getRsnum())
+                .setFactoryNo(order.getWerks())
                 .setItems(datas.stream()
                         .filter(item -> item.getLeft().compareTo(BigDecimal.ZERO) > 0)
                         .map(item -> new OutProduceItemVO()

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

@@ -272,6 +272,7 @@ public class OutProduceController extends BaseController {
                 .setAufnr(order.getAufnr())
                 .setRsnum(order.getRsnum())
                 .setLgort(order.getLgort2())
+                .setFactoryNo(order.getDwerk())
                 .setItems(datas.stream()
                         .filter(item -> item.getSqsl().subtract(item.getNum()).compareTo(BigDecimal.ZERO) > 0)
                         .map(item -> new OutProduceItemVO()

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

@@ -192,6 +192,7 @@ public class TransferFactoryController extends BaseController {
                 .setMblnr(order.getMblnr())
                 .setBwart(order.getBwart())
                 .setLgort(order.getLgort())
+                .setFactoryNo(order.getWerks())
                 .setItems(datas.stream()
                         .map(item -> new TransferFactoryPdaItemVO()
                                 .setId(item.getId())
@@ -309,6 +310,7 @@ public class TransferFactoryController extends BaseController {
                 .setMblnr(ticket.getMblnr())
                 .setLgort(ticket.getLgort())
                 .setLgort1(ticket.getUmlgo())
+                .setFactoryNo(ticket.getWerks())
                 .setItems(itemVOS.stream().map(it -> new TransferFactoryPdaItemVO()
                         .setId(it.getId())
                         .setMatnr(it.getMatnr())

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

@@ -54,4 +54,8 @@ public class ComponentPackingItemPdaVO {
         return menge.subtract(outQty);
     }
 
+    /**
+     * 工厂
+     */
+    private String factoryNo;
 }

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

@@ -36,5 +36,10 @@ public class OutProduce1VO {
      */
     private String supplierName;
 
+    /**
+     * 工厂
+     */
+    private String factoryNo;
+
     private List<OutProduceItemVO> items;
 }

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

@@ -34,5 +34,10 @@ public class TransferFactoryPdaVO {
      */
     private String lgort1;
 
+    /**
+     * 工厂
+     */
+    private String factoryNo;
+
     private List<TransferFactoryPdaItemVO> items;
 }