From a439883fdf1c70453f12eda2a65da50bfe0052cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Wed, 8 May 2024 10:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=84=20=E5=8F=91?=
 =?UTF-8?q?=E8=BF=90=E7=BB=84=E4=BB=A3=E7=A0=81=E5=94=AF=E4=B8=80=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesLoadingVehiclesOrderService.java       | 55 ++++++++++++++++++++++
 .../base/MesShippingOrderManagementService.java    | 45 +++++++++++++++++-
 .../ext/mes/pojo/constant/MesCommonConstant.java   |  8 ++--
 3 files changed, 103 insertions(+), 5 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 133ea2d..75cc5b6 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
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingVehiclesOrderService;
+import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtEnumUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
@@ -9,6 +10,9 @@ 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.repository.MesPartShippingGroupRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -30,11 +34,62 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
     @Autowired
     private MesLoadingVehiclesOrderDetailService detailService;
 
+    @Autowired
+    private MesPartShippingGroupRepository partShippingGroupRepository;
+
+
     @Override
     public MesLoadingVehiclesOrder insert(MesLoadingVehiclesOrder bean) {
         //插入前构造并校验数据
         onInsertBean(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())) {
+            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())) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+                    .build();
+        }
+        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory())) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件发运组是否启用记忆不能为空，请检查数据", shippingOrderManagement.getShippingGroupNo())
+                    .build();
+        }
+
+//        bean.setIsLoading(partShippingGroup.getIsLoading());
+        bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
+        bean.setIsEnableMemory(partShippingGroup.getIsEnableMemory());
+
         List<MesLoadingVehiclesOrderDetail> detailList = new ArrayList<>();
         MesLoadingVehiclesOrder finalBean = bean;
         bean.getShippingOrderNoList().forEach(k -> {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
index 9e6e0ba..ea75abf 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
@@ -7,9 +7,11 @@ 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.MesPartShippingGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartShippingGroupDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagement;
 import cn.estsh.i3plus.pojo.mes.bean.MesShippingOrderManagementDetail;
+import cn.estsh.i3plus.pojo.mes.repository.MesPartShippingGroupRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -33,6 +35,9 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     @Autowired
     private MesPartShippingGroupDetailService shippingGroupDetailService;
 
+    @Autowired
+    private MesPartShippingGroupRepository partShippingGroupRepository;
+
 
     protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
@@ -49,6 +54,44 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         //插入前构造并校验数据
         onInsertBean(bean);
 
+        DdlPackBean partShipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(bean.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】零件发运组数据为空，请检查数据", bean.getShippingGroupNo())
+                    .build();
+        }
+
+        if (StringUtils.isEmpty(partShippingGroup.getIsLoading())) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件发运组是否有装车不能为空，请检查数据", bean.getShippingGroupNo())
+                    .build();
+        }
+        if (StringUtils.isEmpty(partShippingGroup.getIsFirstInstall())) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件发运组是否先装车不能为空，请检查数据", bean.getShippingGroupNo())
+                    .build();
+        }
+        if (StringUtils.isEmpty(partShippingGroup.getIsEnableMemory())) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("【%s】零件发运组是否启用记忆不能为空，请检查数据", bean.getShippingGroupNo())
+                    .build();
+        }
+
+        bean.setIsLoading(partShippingGroup.getIsLoading());
+        bean.setIsFirstInstall(partShippingGroup.getIsFirstInstall());
+        bean.setIsEnableMemory(partShippingGroup.getIsEnableMemory());
+
         //查询物料发运组明细数据
         DdlPackBean shipGroupPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", shipGroupPackBean);
@@ -57,7 +100,7 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("【%s】发运组明细数据为空，请检查数据", bean.getShippingGroupNo())
+                    .setErrorDetail("【%s】零件发运组明细数据为空，请检查数据", bean.getShippingGroupNo())
                     .build();
         }
 
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
index f8cfcca..9129d0d 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/constant/MesCommonConstant.java
@@ -6,13 +6,13 @@ public class MesCommonConstant {
     //yanfeng
     public static final String MES_YANFEN = "/mes/ext";
 
-    public static final String TRUE_STRING = "2";
+    public static final String TRUE_STRING = "1";
 
-    public static final String FALSE_STRING = "1";
+    public static final String FALSE_STRING = "2";
 
-    public static final Integer TRUE_INTEGER = 2;
+    public static final Integer TRUE_INTEGER = 1;
 
-    public static final Integer FALSE_INTEGER = 1;
+    public static final Integer FALSE_INTEGER = 2;
 
 
 }