Merge remote-tracking branch 'origin/dev-temp-xw-202501031636-44657' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java

@@ -36,7 +36,6 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.map.HashedMap;
@@ -466,7 +465,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         DdlPreparedPack.getStringEqualPack(sn.getPartNo(),"partNo",packBean);
         //更新加工记录
         mesProductionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
-                new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
+                new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);
         //更新装配记录
         mesProductionAssemblyRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "productSn", "description", "systemSyncStatus"},
                 new Object[]{userName, TimeTool.getNowTime(true), sn.getProductSn(), sn.getDescription(), CommonEnumUtil.FALSE}, packBean);