修改上架明细报错

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java

@@ -494,4 +494,5 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
     private BigDecimal erpPriceGw;
     //申报总价
     private BigDecimal amountGw;
+    private String khdm;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java

@@ -602,4 +602,5 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase
     private BigDecimal amountGw;
     private String inOrderNumberGw;
     private String inLineNumGw;
+    private String khdm;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -476,4 +476,5 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("业务计价方式")
     private String businessPriceWay;
+    private String khdm;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -267,7 +267,17 @@ public class ReservationStockInOrderApplicationService {
      */
     public ReservationStockInOrderPO getInfo(Long inOrderId)
     {
-        return stockInOrderDomainService.getInfo(inOrderId);
+        ReservationStockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId);
+        String userNcCode = reservationStockInOrderMapper.getUserNcCode(info.getShipperId());
+        info.setKhdm(userNcCode);
+        List<ReservationInMaterialDetailPO> materialDetailList = info.getMaterialDetailList();
+        if (materialDetailList != null && !materialDetailList.isEmpty()) {
+            for (ReservationInMaterialDetailPO materialDetail : materialDetailList) {
+                materialDetail.setKhdm(userNcCode);
+            }
+            info.setMaterialDetailList(materialDetailList);
+        }
+        return info;
     }
 
 

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -504,4 +504,5 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private Integer trainNo;
+    private String khdm;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java

@@ -294,11 +294,18 @@ public class ReservationStockOutOrderApplicationService {
     public ReservationStockOutOrderPO getInfoChildren(Long outOrderId)
     {
         ReservationStockOutOrderPO stockOutOrderPO = stockOutOrderDomainService.getInfoChildren(outOrderId);
-        
+        String userNcCode = reservationStockInOrderMapper.getUserNcCode(stockOutOrderPO.getShipperId());
         if (stockOutOrderPO == null || CollectionUtils.isEmpty(stockOutOrderPO.getMaterialDetailList())) {
             return stockOutOrderPO;
         }
-        
+        stockOutOrderPO.setKhdm(userNcCode);
+        List<ReservationOutMaterialDetailPO> materialDetailList = stockOutOrderPO.getMaterialDetailList();
+        if (CollectionUtils.isEmpty(materialDetailList)) {
+            for (ReservationOutMaterialDetailPO reservationOutMaterialDetailPO : materialDetailList) {
+                reservationOutMaterialDetailPO.setKhdm(userNcCode);
+            }
+            stockOutOrderPO.setMaterialDetailList(materialDetailList);
+        }
         List<ReservationOutMaterialDetailPO> detailList = stockOutOrderPO.getMaterialDetailList();
         String outOrderNumber = stockOutOrderPO.getOutOrderNumber();
         for (ReservationOutMaterialDetailPO reservationOutMaterialDetailPO : detailList) {

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -484,7 +484,19 @@ public class StockInOrderApplicationService {
      */
     public StockInOrderPO getInfo(Long inOrderId)
     {
-        return stockInOrderDomainService.getInfo(inOrderId);
+        StockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId);
+        String userNcCode = stockOutOrderMapper.getUserNcCode(info.getShipperId());
+        info.setKhdm(userNcCode);
+        List<InMaterialDetailPO> materialDetailList = info.getMaterialDetailList();
+        if (materialDetailList != null && !materialDetailList.isEmpty()) {
+            for (InMaterialDetailPO inMaterialDetailPO : materialDetailList) {
+                // TODO: 设置物料详情信息
+                inMaterialDetailPO.setKhdm(userNcCode);
+            }
+            info.setMaterialDetailList(materialDetailList);
+        }
+
+        return info;
     }
 
 

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -333,13 +333,19 @@ public class StockOutOrderApplicationService {
     public StockOutOrderPO getInfoChildren(Long outOrderId)
     {
         StockOutOrderPO stockOutOrderPO = stockOutOrderDomainService.getInfoChildren(outOrderId);
-        
+        String userNcCode = stockOutOrderMapper.getUserNcCode(stockOutOrderPO.getShipperId());
+        stockOutOrderPO.setKhdm(userNcCode);
         if (stockOutOrderPO == null || CollectionUtils.isEmpty(stockOutOrderPO.getMaterialDetailList())) {
             return stockOutOrderPO;
         }
         
         List<OutMaterialDetailPO> detailList = stockOutOrderPO.getMaterialDetailList();
-        
+        if (detailList == null || detailList.isEmpty()) {
+            for (OutMaterialDetailPO outMaterialDetailPO : detailList) {
+                outMaterialDetailPO.setKhdm(userNcCode);
+            }
+        }
+        stockOutOrderPO.setMaterialDetailList(detailList);
         // 性能优化：批量获取批次属性，避免N+1查询问题
         // 1. 收集所有唯一的materialBaseInfoId
         Set<Long> materialBaseInfoIdSet = detailList.stream()

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java

@@ -438,4 +438,5 @@ public class InMaterialDetailPO extends StockInOrderBasePO {
     private BigDecimal erpPriceGw;
     //申报总价
     private BigDecimal amountGw;
+    private String khdm;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java

@@ -567,4 +567,5 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO {
     private String bondInvtNoGw;
     private String whNoGw;
     private String seatNoGw;
+    private String khdm;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java

@@ -442,5 +442,6 @@ public class StockInOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    private String khdm;
 
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -450,4 +450,5 @@ public class StockOutOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    private String khdm;
 }