aps-计划时间取消秒数

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -1,6 +1,7 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -2868,20 +2869,21 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     continue;
                 }
                 List<ApsProcessOperationProcessEquDo> myList = new LinkedList<>();
-                needUpdate.setPlanstartdate(workShopExportVo.getPlanstartdate());
-                needUpdate.setPlanenddate(DateUtil.offsetMinute(workShopExportVo.getPlanstartdate(), workTime));
+                DateTime planStartDate = DateUtil.truncate(workShopExportVo.getPlanstartdate(), DateField.MINUTE);
+                needUpdate.setPlanstartdate(planStartDate);
+                needUpdate.setPlanenddate(DateUtil.offsetMinute(planStartDate, workTime));
                 myList.add(needUpdate);
                 resMap.put(aspCheckItemsDo.getId(), myList);
             } else {
                 List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = resMap.get(aspCheckItemsDo.getId());
                 ApsProcessOperationProcessEquDo lastEquDo = apsProcessOperationProcessEquDos.get(apsProcessOperationProcessEquDos.size() - 1);
-                if (workShopExportVo.getPlanstartdate() != null
-                        && lastEquDo.getPlanenddate().after(workShopExportVo.getPlanstartdate())) {
-                    errorMessageList.add("第" + num + "行计划开工时间填写错误，和该设备上一道作业时间重叠；");
-                    continue;
-                }
                 if (workShopExportVo.getPlanstartdate() != null) {
-                    needUpdate.setPlanstartdate(workShopExportVo.getPlanstartdate());
+                    DateTime planStartDate = DateUtil.truncate(workShopExportVo.getPlanstartdate(), DateField.MINUTE);
+                    if (lastEquDo.getPlanenddate().after(planStartDate)) {
+                        errorMessageList.add("第" + num + "行计划开工时间填写错误，和该设备上一道作业时间重叠；");
+                        continue;
+                    }
+                    needUpdate.setPlanstartdate(planStartDate);
                 } else {
                     needUpdate.setPlanstartdate(lastEquDo.getPlanenddate());
                     if (apsProductionProcessesDo.getProcesscategory().equals("20")) {//当前工序为轧机

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
@@ -490,7 +491,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             if (ObjectUtil.isNotEmpty(earlyMergeStartDate)) {
                 apsReportRecordsDo.setStartworktime(earlyMergeStartDate);
             } else {
-                apsReportRecordsDo.setStartworktime(DateUtil.date());
+                apsReportRecordsDo.setStartworktime(DateUtil.truncate(DateUtil.date(), DateField.MINUTE));
             }
 //        //报工时间
 //        apsReportRecordsDo.setReportworktime(DateUtil.date());
@@ -513,7 +514,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             // 则炉次号=该合并作业明细的报工状态是已开工的报工记录的炉次号
             boolean createNewHeat = false;
             //合并作业明细的实际开工时间
-            Date mergeActualStartDate = DateUtil.date();
+            Date mergeActualStartDate = DateUtil.truncate(DateUtil.date(), DateField.MINUTE);
             if (apsProcessOperationDo.getProcessway().equals("合并加工")) {
                 List<ApsProcessOperationProcessEquDo> apsProcessEquMergeStartingList = this.baseMapper.selectOtherMergeProcessStarting(apsProcessOperationProcessEquDo.getId(), apsProcessOperationProcessEquDo.getProcessdeviceid());
                 if (!apsProcessEquMergeStartingList.isEmpty()) {
@@ -568,7 +569,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             needUpdateProcessOperationProcessEqu.setStartingroll(newStartingRoll);
             if (newStartingRoll.equals(1)) {
                 //更新实际开工时间
-                Date startWorkTime = DateUtil.date();
+                Date startWorkTime = DateUtil.truncate(DateUtil.date(), DateField.MINUTE);
                 //如果炉次号是新开的炉次号，则实际开工时间=报工记录的开工时间；
                 //如果炉次号是已开工的炉次号，则实际开工时间=该合并作业明细的实际开工时间；
                 if (createNewHeat) {
@@ -617,7 +618,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             needUpdateProcessOperation.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - newProcessStartingRoll - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
             needUpdateProcessOperation.setStartingroll(newProcessStartingRoll);
             if (newProcessStartingRoll.equals(1)) {
-                needUpdateProcessOperation.setActualstartdate(DateUtil.date());
+                needUpdateProcessOperation.setActualstartdate(DateUtil.truncate(DateUtil.date(), DateField.MINUTE));
                 needUpdateProcessOperation.setWorkstatus("加工中");
                 needUpdateProcessOperation.setProcessstatus(SaveConstans.ProductionStatus.PROCESSING);
             }
@@ -1728,7 +1729,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             apsReportRecordsDo.setChiefoperatorid(currentUser.getId());
             apsReportRecordsDo.setChiefoperatorname(currentUser.getName());
             //开工时间
-            apsReportRecordsDo.setStartworktime(DateUtil.date());
+            apsReportRecordsDo.setStartworktime(DateUtil.truncate(DateUtil.date(), DateField.MINUTE));
             //报工状态
             apsReportRecordsDo.setReportworkstatus("已开工");
             apsReportRecordsDo.setCheckstatus("待检验");
@@ -1749,7 +1750,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             // 则炉次号=该合并作业明细的报工状态是已开工的报工记录的炉次号
             boolean createNewHeat = false;
             //合并作业明细的实际开工时间
-            Date mergeActualStartDate = DateUtil.date();
+            Date mergeActualStartDate = DateUtil.truncate(DateUtil.date(), DateField.MINUTE);
             if (apsProcessOperationDo.getProcessway().equals("合并加工")) {
                 List<ApsProcessOperationProcessEquDo> apsProcessEquMergeStartingList = this.baseMapper.selectOtherMergeProcessStarting(apsProcessOperationProcessEquDo.getId(), apsProcessOperationProcessEquDo.getProcessdeviceid());
                 if (!apsProcessEquMergeStartingList.isEmpty()) {