From 756bfeeea6cbe1031537c96b2e69081429fa23cc Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Wed, 5 Feb 2025 18:19:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?44838=20=20MES:=E8=A3=81=E7=89=87=E8=A1=A5?=
 =?UTF-8?q?=E7=89=87=E9=80=BB=E8=BE=91=E6=9B=B4=E6=96=B0=EF=BC=86=E8=A3=81?=
 =?UTF-8?q?=E7=89=87=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
index ccb918b..90b8c82 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
@@ -215,7 +215,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
         DdlPreparedPack.getStringEqualPack(workOrderMaterialCutModel.getCutWorkOrderNo(), MesExtConstWords.CUT_WORK_ORDER_NO, packBean);
 
         workOrderCutRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "isDeleted", "printStatus"},
-                new Object[]{userName, TimeTool.getNowTime(true), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue() }, packBean);
+                new Object[]{userName, TimeTool.getNowTime(true), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue() }, packBean);
 
     }
 

From 123ac16c08a78db0a5675504aa536001ba541b4c Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Wed, 5 Feb 2025 21:20:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=A2=E5=A4=96=E7=84=8A=E8=B6=85?=
 =?UTF-8?q?=E5=B7=AE=E9=A2=84=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesEquipmentSpotCheckDetailService.java   | 69 ++++++++++++++++++---
 .../base/MesEquipmentSpotCheckPartService.java     | 72 ++++++++++++++++++----
 .../i3plus/ext/mes/pojo/util/MesExtConstWords.java |  2 +
 3 files changed, 123 insertions(+), 20 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java
index cfb0326..a91c29f 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckDetailService.java
@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesEquipmentSpotCheckDetailService;
 import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.BeanMapUtilsExt;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
+import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -37,9 +38,10 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
     private MesEquipmentVariableRepository mesEquipmentVariableRepository;
 
     protected void setPackQueryBean(MesEquipmentSpotCheckDetail bean, DdlPackBean packBean) {
-        DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getPid(), MesExtConstWords.PID, packBean);
         DdlPreparedPack.getStringLikerPack(bean.getSpotCheckItemCode(), "spotCheckItemCode", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getSpotCheckItemName(), "spotCheckItemName", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipCode(), MesExtConstWords.EQUIP_CODE, packBean);
         DdlPreparedPack.getNumEqualPack(bean.getDataType(), "dataType", packBean);
         DdlPreparedPack.getNumEqualPack(bean.getSpotCheckItemType(), "spotCheckItemType", packBean);
         //43100 设备点检设置明细导入完成后，期望序列号可以正排
@@ -53,7 +55,7 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
         ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
@@ -63,6 +65,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
                     .setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
                     .build();
         }
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+        MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+        if (null == equipmentSpotCheck) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                    .build();
+        }
+        item.setEquipCode(equipmentSpotCheck.getEquipCode());
+
     }
 
     @Override
@@ -71,9 +86,9 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
         ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
-        DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
+        DdlPreparedPack.getNumNOEqualPack(item.getId(), MesExtConstWords.ID, roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
@@ -82,6 +97,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
                     .setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
                     .build();
         }
+
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+        MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+        if (null == equipmentSpotCheck) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                    .build();
+        }
+        item.setEquipCode(equipmentSpotCheck.getEquipCode());
+
     }
     @Override
     public void validateImport(List<MesEquipmentSpotCheckDetail> beanList) {
@@ -91,7 +119,7 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
             ValidatorBean.checkNotNull(item.getSpotCheckItemCode(), "点检项代码不能为空");
 
             DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-            DdlPreparedPack.getNumEqualPack(item.getPid(), "pid", roadPackBean);
+            DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.PID, roadPackBean);
             DdlPreparedPack.getStringEqualPack(item.getSpotCheckItemCode(), "spotCheckItemCode", roadPackBean);
             boolean flg = baseRDao.isExitByHql(roadPackBean);
             if (flg) {
@@ -101,6 +129,19 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
                         .setErrorDetail("点检项代码【%s】已经存在，请检查数据", item.getSpotCheckItemCode())
                         .build();
             }
+
+            DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+            DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+            MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+            if (null == equipmentSpotCheck) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                        .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                        .build();
+            }
+            item.setEquipCode(equipmentSpotCheck.getEquipCode());
+
         }
     }
     @Override
@@ -125,19 +166,33 @@ public class MesEquipmentSpotCheckDetailService extends BaseMesService<MesEquipm
                             .build();
                 }
                 item.setPid(itemFlg.getId());
+                item.setEquipCode(itemFlg.getEquipCode());
             }else {
                 ValidatorBean.checkNotNull(item.getId(), "点检项目id不能为空");
 
                 DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-                DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", seriesPackBean);
+                DdlPreparedPack.getNumEqualPack(item.getId(), MesExtConstWords.ID, seriesPackBean);
 
                 if (!baseRDao.isExitByHql(seriesPackBean)) {
                     throw ImppExceptionBuilder.newInstance()
                             .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                             .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                            .setErrorDetail("【%s】点检项目id不存在，请检查数据", item.getPid())
+                            .setErrorDetail("【%s】点检项目id不存在，请检查数据", item.getId())
                             .build();
                 }
+
+                DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+                DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+                MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+                if (null == equipmentSpotCheck) {
+                    throw ImppExceptionBuilder.newInstance()
+                            .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                            .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                            .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                            .build();
+                }
+                item.setEquipCode(equipmentSpotCheck.getEquipCode());
+
             }
             //实际值地址id
             if (!Objects.isNull(variableMap) && !StringUtil.isEmpty(item.getRealValueAddress()) && variableMap.containsKey(item.getRealValueAddress())) {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckPartService.java
index d72ef83..1646914 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckPartService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentSpotCheckPartService.java
@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.ext.mes.apiservice.utils.MesException;
 import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+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;
@@ -15,6 +16,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.repository.MesEquipmentSpotCheckRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesPartRepository;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
+import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +35,39 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
 
     @Override
     protected void setPackQueryBean(MesEquipmentSpotCheckPart bean, DdlPackBean packBean) {
-        DdlPreparedPack.getNumEqualPack(bean.getPid(), "pid", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(bean.getPid(), MesExtConstWords.PID, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getPartNo(), MesExtConstWords.PART_NO, packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getEquipCode(), MesExtConstWords.EQUIP_CODE, packBean);
+    }
+
+    @Override
+    protected void onInsertBean(MesEquipmentSpotCheckPart item) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+        MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+        if (null == equipmentSpotCheck) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                    .build();
+        }
+        item.setEquipCode(equipmentSpotCheck.getEquipCode());
+    }
+
+    @Override
+    protected void onUpdateBean(MesEquipmentSpotCheckPart item) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+        MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+        if (null == equipmentSpotCheck) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                    .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                    .build();
+        }
+        item.setEquipCode(equipmentSpotCheck.getEquipCode());
     }
 
     @Override
@@ -52,9 +85,10 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
                     MesException.throwMesBusiException("点检项目代码【%s】不存在，请检查数据", item.getSpotCheckCode());
                 }
                 item.setPid(itemFlg.getId());
+                item.setEquipCode(itemFlg.getEquipCode());
 
                 DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-                DdlPreparedPack.getStringEqualPack(item.getPartNo(),"partNo", partPackBean);
+                DdlPreparedPack.getStringEqualPack(item.getPartNo(), MesExtConstWords.PART_NO, partPackBean);
                 MesPart mesPart = mesPartRepository.getByProperty(partPackBean);
                 if (mesPart == null) {
                     MesException.throwMesBusiException("零件号【%s】不存在", item.getPartNo());
@@ -64,12 +98,17 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
             } else {
                 ValidatorBean.checkNotNull(item.getPid(), "点检项目id不能为空");
 
-                DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-                DdlPreparedPack.getNumEqualPack(item.getPid(), "id", seriesPackBean);
-
-                if (!equipmentSpotCheckRepository.isExitByHql(seriesPackBean)) {
-                    MesException.throwMesBusiException("点检项目id【%s】不存在，请检查数据", item.getPid());
+                DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+                DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+                MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+                if (null == equipmentSpotCheck) {
+                    throw ImppExceptionBuilder.newInstance()
+                            .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                            .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                            .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                            .build();
                 }
+                item.setEquipCode(equipmentSpotCheck.getEquipCode());
             }
             item.setId(null);
             item.setSystemSyncStatus(CommonEnumUtil.FALSE);
@@ -93,15 +132,22 @@ public class MesEquipmentSpotCheckPartService extends BaseMesService<MesEquipmen
                     MesException.throwMesBusiException("点检项目代码【%s】不存在，请检查数据", item.getSpotCheckCode());
                 }
                 item.setPid(itemFlg.getId());
+                item.setEquipCode(itemFlg.getEquipCode());
             } else {
                 ValidatorBean.checkNotNull(item.getPid(), "点检项目id不能为空");
 
-                DdlPackBean seriesPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-                DdlPreparedPack.getNumEqualPack(item.getPid(), "id", seriesPackBean);
-
-                if (!equipmentSpotCheckRepository.isExitByHql(seriesPackBean)) {
-                    MesException.throwMesBusiException("点检项目id【%s】不存在，请检查数据", item.getPid());
+                DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+                DdlPreparedPack.getNumEqualPack(item.getPid(), MesExtConstWords.ID, packBean);
+                MesEquipmentSpotCheck equipmentSpotCheck = equipmentSpotCheckRepository.getByProperty(packBean);
+                if (null == equipmentSpotCheck) {
+                    throw ImppExceptionBuilder.newInstance()
+                            .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
+                            .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
+                            .setErrorDetail("点检方案ID【%s】信息不存在，请检查数据", item.getPid())
+                            .build();
                 }
+                item.setEquipCode(equipmentSpotCheck.getEquipCode());
+
             }
         }
         return beanList;
diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
index e262114..4b32dc2 100644
--- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
+++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
@@ -35,6 +35,8 @@ public class MesExtConstWords {
     public static final String EQUIPMENT_CODE = "equipmentCode";
     // 设备名称
     public static final String EQUIPMENT_NAME = "equipmentName";
+    // 设备代码
+    public static final String EQUIP_CODE = "equipCode";
     // 开模记录ID
     public static final String MOULD_RECORD_ID = "mouldRecordId";
     // 设备数据变量ID