问题清单修复

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingService.java

@@ -2,18 +2,20 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesJisShippingService;
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesPartShippingGroupService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesJisShipping;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
-import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementDetailRepository;
-import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,14 +33,13 @@ import java.util.UUID;
 public class MesJisShippingService implements IMesJisShippingService {
 
     @Autowired
-    private MesShippingOrderManagementRepository shippingOrderManagementRepository;
+    private IMesPartShippingGroupService mesPartShippingGroupService;
-    @Autowired
+
-    private MesShippingOrderManagementDetailRepository shippingOrderManagementDetailRepository;
     @Autowired
     private IMesConfigService configService;
 
     public List<MesJisShipping> getJisShipping(MesShippingOrderManagement orderManagement, List<MesShippingOrderManagementDetail> orderManagementDetailList, String org) {
-
+        MesPartShippingGroup mesPartShippingGroup = mesPartShippingGroupService.getMesPartShippingGroup(org, orderManagement.getShippingGroupCode());
         List<MesJisShipping> jisShippingList = new ArrayList<>();
         orderManagementDetailList.forEach(k -> {
             MesJisShipping jisShipping = new MesJisShipping();
@@ -47,7 +48,7 @@ public class MesJisShippingService implements IMesJisShippingService {
             jisShipping.setFactoryCode(orderManagement.getCustOrganizeCode());
             jisShipping.setShippingTime(TimeTool.getNowTime(true));
             jisShipping.setErpWarerhouse(configService.getCfgValue(org, "ERP_WARERHOUSE"));
-            jisShipping.setErpWarehous(configService.getCfgValue(org, "ERP_WAREHOUS"));
+            jisShipping.setErpWarehous(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(org, "ERP_WAREHOUS") : mesPartShippingGroup.getSrcWarerhouse());
             jisShipping.setDock(orderManagement.getSendDockCode());
             jisShipping.setCusCode(orderManagement.getCustCode());
             jisShipping.setCusDock(orderManagement.getCustDockCode());
@@ -57,6 +58,7 @@ public class MesJisShippingService implements IMesJisShippingService {
             jisShipping.setOffTime(TimeTool.getNowTime(true));
             jisShipping.setShippingOrderCode(orderManagement.getShippingCode());
             jisShipping.setFid(UUID.randomUUID().toString());
+            jisShipping.setSystemSyncStatus(CommonEnumUtil.FALSE);
             ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
             jisShippingList.add(jisShipping);
         });