Merge branch 'uat_temp-xw-202502110000-45034' into dev

# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java

@@ -61,6 +61,9 @@ public class MesProductionRecordService implements IMesProductionRecordService {
     @Autowired
     private MesWorkCellRepository mesWorkCellRepository;
 
+    @Autowired
+    private MesProductionRecordRepository productionRecordRao;
+
     @Override
     public List<MesProductionRecord> findProductionRecordList(String organizeCode, String productSn) {
         if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(productSn)) return null;
@@ -251,15 +254,14 @@ public class MesProductionRecordService implements IMesProductionRecordService {
 
     @Override
     public void updateProductionRecord(List<MesProductionRecord> recordList, String userName, Integer reportStatus, String msg) {
+
         recordList.forEach(record->{
-            record.setReportStatus(reportStatus);
+            DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(record.getOrganizeCode());
-            record.setRemark(msg);
+            DdlPreparedPack.getNumEqualPack(record.getId(), "id", ddlPackBean);
-            record.setSystemSyncStatus(CommonEnumUtil.FALSE);
+            productionRecordRao.updateByPropertiesNoSync(new String[]{"modifyUser", "modifyDatetime", "reportStatus","remark","systemSyncStatus","systemSyncDatetime"},
-            record.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY);
+                    new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), reportStatus,msg,CommonEnumUtil.FALSE,""}, ddlPackBean);
-            ConvertBean.serviceModelUpdate(record,userName);
+
-            record.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
         });
-        productionRecordRepository.saveAll(recordList);
     }
 
 }