点检

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesJisShippingService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.pcn.api.busi;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesJisShipping;
+import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
 import io.swagger.annotations.ApiOperation;
 
@@ -16,5 +17,5 @@ import java.util.List;
 public interface IMesJisShippingService {
 
     @ApiOperation(value = "构筑发运报工数据")
-    public List<MesJisShipping> getJisShipping(List<MesShippingOrderManagementDetail> orderManagementDetailList, String org);
+    public List<MesJisShipping> getJisShipping(MesShippingOrderManagement orderManagement, List<MesShippingOrderManagementDetail> orderManagementDetailList, String org);
 }

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

@@ -3,8 +3,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesJisShippingService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
-import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesJisShipping;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingOrderManagementDetail;
@@ -35,30 +33,30 @@ public class MesJisShippingService implements IMesJisShippingService {
     @Autowired
     private MesShippingOrderManagementDetailRepository shippingOrderManagementDetailRepository;
 
-    public List<MesJisShipping> getJisShipping(List<MesShippingOrderManagementDetail> orderManagementDetailList, String org) {
+    public List<MesJisShipping> getJisShipping(MesShippingOrderManagement orderManagement, List<MesShippingOrderManagementDetail> orderManagementDetailList, String org) {
 
 
-        DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
+//        DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
-        DdlPreparedPack.getStringEqualPack(orderManagementDetailList.get(0).getLoadingOrderNo(), "shippingCode", packBean);
+//        DdlPreparedPack.getStringEqualPack(orderManagementDetailList.get(0).getLoadingOrderNo(), "shippingCode", packBean);
-        MesShippingOrderManagement originBean = shippingOrderManagementRepository.getByProperty(packBean);
+//        MesShippingOrderManagement originBean = shippingOrderManagementRepository.getByProperty(packBean);
-
+//
-        DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(org);
+//        DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(org);
-        DdlPreparedPack.getStringEqualPack(originBean.getShippingCode(), "shippingCode", detailPackBean);
+//        DdlPreparedPack.getStringEqualPack(originBean.getShippingCode(), "shippingCode", detailPackBean);
-        List<MesShippingOrderManagementDetail> detailDeleteList = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
+//        List<MesShippingOrderManagementDetail> detailDeleteList = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
 
         List<MesJisShipping> jisShippingList = new ArrayList<>();
         orderManagementDetailList.forEach(k -> {
             MesJisShipping jisShipping = new MesJisShipping();
-            BeanUtils.copyProperties(originBean, jisShipping, "id");
+            BeanUtils.copyProperties(orderManagement, jisShipping, "id");
             BeanUtils.copyProperties(k, jisShipping, "id");
-            jisShipping.setFactoryCode(originBean.getCustOrganizeCode());
+            jisShipping.setFactoryCode(orderManagement.getCustOrganizeCode());
             jisShipping.setShippingTime(TimeTool.getNowTime(true));
-            jisShipping.setDock(originBean.getSendDockCode());
+            jisShipping.setDock(orderManagement.getSendDockCode());
-            jisShipping.setCusDock(originBean.getCustDockCode());
+            jisShipping.setCusDock(orderManagement.getCustDockCode());
             jisShipping.setCustOrderNo(k.getCustOrderNo());
             jisShipping.setSerialNumber(k.getBarcode());
-            jisShipping.setQuantityPerCar(detailDeleteList.size());
+            jisShipping.setQuantityPerCar(orderManagementDetailList.size());
-            jisShipping.setShippingOrderCode(originBean.getShippingCode());
+            jisShipping.setShippingOrderCode(orderManagement.getShippingCode());
             ConvertBean.serviceModelInitialize(jisShipping, AuthUtil.getSessionUser().getUserName());
             jisShippingList.add(jisShipping);
         });

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

@@ -86,7 +86,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             }
 
             DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(shippingOrderManagement.organizeCode);
-            DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderDetailPackBean);
+            DdlPreparedPack.getNumEqualPack(orderManagement.getLoadingListId(), "id", orderDetailPackBean);
             MesLoadingList loadingList = ListRepository.getByProperty(orderDetailPackBean);
             if (StringUtils.isEmpty(loadingList)) {
                 throw new ImppBusiException(String.format("【%s】此发运单配置是否装车为是,但没生成装车单，请检查数据！", shippingOrderManagement.getShippingCode()));
@@ -331,7 +331,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
         }
 
         //当前发运单明细 需要报工的数据
-        List<MesJisShipping> jisShippingList = jisShippingService.getJisShipping(orderManagementDetailList, org);
+        List<MesJisShipping> jisShippingList = jisShippingService.getJisShipping(orderManagement, orderManagementDetailList, org);
 
         produceSnRepository.saveAll(produceSnList);
         shippingOrderManagementRepository.save(orderManagement);