条码下线 判断修改时间 跟之前是否一样 一样时间加1s

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());

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());
+    }
 }