From f092f6f43447f59a218f2b91ecdfcd782fa8f71a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Wed, 8 May 2024 16:17:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=91=E8=BF=90=E7=BB=84-?=
 =?UTF-8?q?=E5=9C=86=E6=95=B4=E6=96=B9=E5=BC=8F=20=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesLoadingVehiclesOrderService.java       | 87 ++++++++++++++++++++--
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
index c4e2d7d..405c737 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
@@ -8,11 +8,9 @@ import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingVehiclesOrder;
-import cn.estsh.i3plus.pojo.mes.bean.MesLoadingVehiclesOrderDetail;
-import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroup;
-import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
+import cn.estsh.i3plus.pojo.mes.bean.*;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
+import cn.estsh.i3plus.pojo.mes.repository.MesShippingOrderManagementRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -36,6 +34,8 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
 
     @Autowired
     private MesPartShippingGroupRepository partShippingGroupRepository;
+    @Autowired
+    private MesShippingOrderManagementRepository shippingOrderManagementRepository;
 
 
     @Override
@@ -86,20 +86,29 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
                     .build();
         }
 
-//        bean.setIsLoading(partShippingGroup.getIsLoading());
         bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
         bean.setIsEnableMemory(partShippingGroup.getIsEnableMemory());
 
         List<MesLoadingVehiclesOrderDetail> detailList = new ArrayList<>();
         MesLoadingVehiclesOrder finalBean = bean;
+
+        List<String> orderNoList = new ArrayList<>();
         bean.getShippingOrderNoList().forEach(k -> {
             MesLoadingVehiclesOrderDetail detail = new MesLoadingVehiclesOrderDetail();
 
+            orderNoList.add(k.getShippingOrderNo());
             BeanUtils.copyProperties(k, detail, "id");
             detail.setLoadingOrderNo(finalBean.getLoadingOrderNo());
             detail.setWeatherCondition(finalBean.getWeatherCondition());
             detailList.add(detail);
         });
+
+        DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getInPackList(orderNoList, "shippingOrderNo", orderPackBean);
+        List<MesShippingOrderManagement> orderManagementList = shippingOrderManagementRepository.findByHqlWhere(orderPackBean);
+
+        orderManagementList.forEach(k -> k.setLoadingOrderNo(finalBean.getLoadingOrderNo()));
+
         String customerCode = bean.getShippingOrderNoList().get(0).getCustomerCode();
         String customerName = bean.getShippingOrderNoList().get(0).getCustomerName();
         String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustomerOrganizeCode();
@@ -110,8 +119,9 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         bean.setCustomerName(customerName);
         bean.setCustomerOrganizeCode(customerOrganizeCode);
         bean.setCustomerOrganizeName(customerOrganizeName);
-        //TODO 状态待确定
-//        bean.setStatus(MesExtEnumUtil.);
+
+
+        shippingOrderManagementRepository.saveAll(orderManagementList);
         detailService.insertBatch(detailList);
         bean = baseRDao.insert(bean);
         return bean;
@@ -137,6 +147,57 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
         }
     }
 
+
+//    @Override
+//    public MesLoadingVehiclesOrder update(MesLoadingVehiclesOrder bean) {
+//        //更新前构造并校验数据
+//        onUpdateBean(bean);
+//
+//        MesShippingOrderManagement shippingOrderManagement = bean.getShippingOrderNoList().get(0);
+//        DdlPackBean partShipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+//        DdlPreparedPack.getStringEqualPack(shippingOrderManagement.getShippingGroupNo(), "shippingGroupNo", partShipGroupPackBean);
+//        MesPartShippingGroup partShippingGroup = partShippingGroupRepository.getByProperty(partShipGroupPackBean);
+//
+//        if (StringUtils.isEmpty(partShippingGroup)) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】零件发运组数据为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+//                    .build();
+//        }
+//
+//        if (StringUtils.isEmpty(partShippingGroup.getIsLoading()) || partShippingGroup.getIsLoading() == 0) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】零件发运组是否有装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+//                    .build();
+//        }
+//        if (partShippingGroup.getIsLoading() == MesCommonConstant.FALSE_INTEGER) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】零件发运组是否有装车配置为否，则不需要生成装车单，请检查数据", shippingOrderManagement.getShippingGroupNo())
+//                    .build();
+//        }
+//
+//        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall()) || partShippingGroup.getIsFirstInstall() == 0) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+//                    .build();
+//        }
+//        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory()) || partShippingGroup.getIsEnableMemory() == 0) {
+//            throw ImppExceptionBuilder.newInstance()
+//                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+//                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+//                    .setErrorDetail("【%s】零件发运组是否启用记忆不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+//                    .build();
+//        }
+//
+//    }
+
     protected void onInsertBean(MesLoadingVehiclesOrder item) {
 
         List<String> shippingOrderNoList = new ArrayList<>();
@@ -159,6 +220,18 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
                     .build();
         }
 
+        DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(item.getLoadingOrderNo(), "loadingOrderNo", partPackBean);
+//        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", partPackBean);
+        boolean flg = baseRDao.isExitByHql(partPackBean);
+        if (flg) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("发运单【%s】已经存在，请检查数据", item.getLoadingOrderNo())
+                    .build();
+        }
+
     }
 
     protected void setPackQueryBean(MesLoadingVehiclesOrder bean, DdlPackBean packBean) {