From 4b41864be8a87a3f2543ef97ae214eeb207c7ed2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 9 Jan 2024 10:18:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E4=B8=8B=E7=BA=BF=20?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=20?= =?UTF-8?q?=E8=B7=9F=E4=B9=8B=E5=89=8D=E6=98=AF=E5=90=A6=E4=B8=80=E6=A0=B7?= =?UTF-8?q?=20=E4=B8=80=E6=A0=B7=E6=97=B6=E9=97=B4=E5=8A=A01s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../busi/jx/JxProdBusiStrategyCommonService.java | 3 ++- .../ext/mes/pcn/pojo/util/ConvertBeanExt.java | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java index ddfb53f..6d25615 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java @@ -778,7 +778,8 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi MesProduceSnExt produceSnExtDb = queryProduceSnInfo(params).getProduceSnExtDb(); produceSnExtDb.setSnStatus(MesPcnExtEnumUtil.PRODUCE_SN_STATUS.OFFLINE.getValue()); - ConvertBean.serviceModelUpdate(produceSnExtDb, params.getUserInfo()); +// ConvertBean.serviceModelUpdate(produceSnExtDb, params.getUserInfo()); + new ConvertBeanExt().checkMdtAdd1s(produceSnExtDb, params.getUserInfo()); if (MesPcnExtEnumUtil.WORK_ORDER_TYPE.REWORK_ORDER.getValue() != params.getOrderModel().getWorkOrderType()) packProduceSnLineOff(params, produceSnExtDb); produceSnExtService.doPackSnExtProcess((StationRequestBean) params.getObj(), produceSnExtDb); produceSnExtDb.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java index 96ce57f..2922a87 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/ConvertBeanExt.java @@ -4,6 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import lombok.Data; import org.springframework.beans.BeanUtils; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + /** * @DESCRIPTION: * @USER: wangjie @@ -28,6 +32,8 @@ public class ConvertBeanExt { private Integer systemSyncStatusExt; + public ConvertBeanExt() {} + public ConvertBeanExt(BaseBean bean) { this.organizeCodeExt = bean.getOrganizeCode(); this.isValidExt = bean.getIsValid(); @@ -47,4 +53,21 @@ public class ConvertBeanExt { public void convertBean(Object o) { BeanUtils.copyProperties(this, o); } + + public BaseBean checkMdtAdd1s(BaseBean bean, String userName) { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat(MesPcnExtConstWords.DATETIME_FORMAT); + Date date = new Date(); + String dateTime = simpleDateFormat.format(date); + if (dateTime.equals(bean.getModifyDatetime())) dateTime = getModifyDatetimeAdd1s(simpleDateFormat, date); + bean.setModifyUser(userName); + bean.setModifyDatetime(dateTime); + return bean; + } + + private String getModifyDatetimeAdd1s(SimpleDateFormat simpleDateFormat, Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + cal.add(Calendar.SECOND, 1); + return simpleDateFormat.format(cal.getTime()); + } }