补录日志

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java

@@ -7,7 +7,6 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -43,13 +43,14 @@ public class MesWorkCellScanMonitorLogServiceImpl implements IMesWorkCellScanMon
         DdlPackBean logPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"serviceFlag",logPackBean);
         DdlPreparedPack.getIsNotNull("mouldRecordId",logPackBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"createDatetime"}, logPackBean);
         List<MesWorkCellScanMonitorLog> monitorLogs = monitorLogRao.findByHqlTopWhere(logPackBean, pageSize);
 
         if (!monitorLogs.isEmpty()) {
             for (MesWorkCellScanMonitorLog monitorLog : monitorLogs) {
                 Long mouldRecordId = monitorLog.getMouldRecordId();
                 DdlPackBean recordPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-                DdlPreparedPack.getNumEqualPack(mouldRecordId,"mouldRecordId",logPackBean);
+                DdlPreparedPack.getNumEqualPack(mouldRecordId,"mouldRecordId",recordPackBean);
                 List<MesProductionRecord> recordList = productionRecordRao.findByHqlWhere(recordPackBean);
                 //需要补录如下字段
                 if (!recordList.isEmpty()) {
@@ -65,10 +66,11 @@ public class MesWorkCellScanMonitorLogServiceImpl implements IMesWorkCellScanMon
                     monitorLog.setCustSn(custSnStr);
                     monitorLog.setPartNo(partNoStr);
                     monitorLog.setPartName(partNameStr);
-                    ConvertBean.saveOrUpdate(monitorLog,"JOB");
+                    monitorLog.setServiceFlag(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
                 }
+                ConvertBean.saveOrUpdate(monitorLog,"JOB");
+                monitorLogRao.update(monitorLog);
             }
-            monitorLogRao.saveAll(monitorLogs);
         }
 
     }