From 7de9fef6307191ac5986b1044fd38549f3caa7fe Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Thu, 25 Jul 2024 10:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java | 7 ++++---
 .../serviceimpl/base/MesCrossOrganizeCfgServiceImpl.java           | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java
index 48befdf..d124c48 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/BaseMesService.java
@@ -13,7 +13,6 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesSpotCheckOrderPart;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -120,14 +119,16 @@ public abstract class BaseMesService<T extends BaseBean> implements IBaseMesServ
     @Override
     public void deleteWeaklyById(Long id, String userName) {
         onDeleteId(id);
-        baseRDao.deleteWeaklyById(id, userName);
+        //baseRDao.deleteWeaklyById(id, userName);
+        baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)});
     }
 
     @Override
     public void deleteWeaklyByIds(Long[] ids, String userName) {
         for (Long id : ids) {
             onDeleteId(id);
-            baseRDao.deleteWeaklyById(id, userName);
+            //baseRDao.deleteWeaklyById(id, userName);
+            baseRDao.updateByProperties("id", id,new String[]{"isDeleted","modifyUser","modifyDatetime"},new Object[]{CommonEnumUtil.VALID,userName,TimeTool.getNowTime(true)});
         }
     }
 
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCrossOrganizeCfgServiceImpl.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCrossOrganizeCfgServiceImpl.java
index c8e4190..bdc7b77 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCrossOrganizeCfgServiceImpl.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCrossOrganizeCfgServiceImpl.java
@@ -59,6 +59,7 @@ public class MesCrossOrganizeCfgServiceImpl extends BaseMesService<MesCrossOrgan
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getSrcOrganizeCode(), "srcOrganizeCode", packBean);
         DdlPreparedPack.getStringLikerPack(item.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(item.getType(), "type", packBean);
         if (baseRDao.isExitByHql(packBean)) {
             MesException.throwMesBusiException("源工厂代码【%s】物料【%s】，数据已存在", item.getSrcOrganizeCode(), item.getPartNo());
         }
@@ -72,6 +73,7 @@ public class MesCrossOrganizeCfgServiceImpl extends BaseMesService<MesCrossOrgan
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getSrcOrganizeCode(), "srcOrganizeCode", packBean);
         DdlPreparedPack.getStringLikerPack(item.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(item.getType(), "type", packBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", packBean);
         if (baseRDao.isExitByHql(packBean)) {
             MesException.throwMesBusiException("源工厂代码【%s】物料【%s】，数据已存在", item.getSrcOrganizeCode(), item.getPartNo());
@@ -108,6 +110,7 @@ public class MesCrossOrganizeCfgServiceImpl extends BaseMesService<MesCrossOrgan
     private void checkData(MesCrossOrganizeCfg item) {
         ValidatorBean.checkNotNull(item.getSrcOrganizeCode(), "源工厂代码不能为空");
         ValidatorBean.checkNotNull(item.getPartNo(), "零件号不能为空");
+        ValidatorBean.checkNotNull(item.getType(), "类型不能为空");
         if (item.getSrcOrganizeCode().equalsIgnoreCase(item.getOrganizeCode())) {
             MesException.throwMesBusiException("源工厂代码不能和目标工厂代码一样");
         }