From b133ed57b62e3b45e41851607e5d4f1ef9433743 Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Thu, 30 May 2024 13:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E6=B8=85?=
 =?UTF-8?q?=E5=8D=950521?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/serviceimpl/base/BaseMesService.java    |  4 ++--
 .../serviceimpl/base/MesPartProdGroupService.java      | 18 ++++++++++++++++++
 .../serviceimpl/base/MesWorkOrderService.java          |  6 +++++-
 3 files changed, 25 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 b4c2450..28d88ff 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
@@ -101,7 +101,7 @@ public abstract class BaseMesService<T extends BaseBean> implements IBaseMesServ
     public T update(T bean) {
         onUpdateBean(bean);
         T originBean = baseRDao.getById(bean.getId());
-        onModifyBean();
+        onModifyBean(bean,originBean);
         ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
         baseRDao.update(bean);
         return originBean;
@@ -170,7 +170,7 @@ public abstract class BaseMesService<T extends BaseBean> implements IBaseMesServ
     protected void onUpdateBean(T item) {
     }
 
-    protected void onModifyBean() {
+    protected void onModifyBean(T destItem,T srcItem) {
     }
 
     protected void setBeanModel(List<T> list) {
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
index acfba61..4051217 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupService.java
@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.api.base.IMesPartProdGroupService;
+import cn.estsh.i3plus.ext.mes.apiservice.config.AuthUtilExt;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -18,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -94,4 +97,19 @@ public class MesPartProdGroupService extends BaseMesService<MesPartProdGroup> im
                     .build();
         }
     }
+
+    @Override
+    protected void onModifyBean(MesPartProdGroup destItem,MesPartProdGroup srcItem) {
+        String userName = AuthUtilExt.getUserName();
+        //如果主表产线代码修改，明细产线代码也要更新
+        if(!Objects.equals(destItem.getWorkCenterCode(),srcItem.getWorkCenterCode())
+                || !Objects.equals(destItem.getPartProdGroupName(),srcItem.getPartProdGroupName())){
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(srcItem.getOrganizeCode());
+            DdlPreparedPack.getStringEqualPack(srcItem.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
+
+            mesPartProdGroupDetailRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime","workCenterCode","partProdGroupName"},
+                    new Object[]{userName, TimeTool.getNowTime(true),destItem.getWorkCenterCode(),destItem.getPartProdGroupName()},ddlPackBean);
+        }
+
+    }
 }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
index 6f220fb..b379d54 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
@@ -382,7 +382,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         MesPart mesPart = iMesPartService.getPartByPartNo(item.getPartNo(), item.getOrganizeCode());
         item.setPartNameRdd(mesPart.getPartName());
         item.setUnit(mesPart.getUnit());
-
+        //生产时间新增取当天
+        if(StringUtil.isEmpty(item.getProduceTime())){
+            item.setProduceTime(TimeTool.getToday());
+        }
 
     }
 
@@ -455,6 +458,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         } catch (Exception e) {
             MesException.throwMesBusiException("时间格式异常");
         }
+        item.setProduceTime(item.getPlanDate());
     }
 
     @Override