aps-优化

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProcessOperationProcessEquDao.java

@@ -131,11 +131,11 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
 //    @Select("select count(1) from aps_process_operation_process_equ where DELETED = 0 AND PROCESSDEVICEID = #{processdeviceid} AND WORKSTATUS = '已完工'  AND OLDPLANSTARTDATE = #{planStartDate}")
     int selectHaveOtherDevice2(@Param("processdeviceid") String processdeviceid,@Param("heatNumber") String heatNumber,@Param("yearMonth") String yearMonth);
 
-    void repairePlanStartDate(@Param("userId") String userId,@Param("userName")String userName);
+    void repairePlanStartDate();
 
     List<ApsProcessOperationProcessEquCheckVo> getNeedCheckEquList(@Param("startTime") DateTime startTime, @Param("tenantId") String tenantId);
 
-    void repairePlanStartDate2(@Param("userId") String userId,@Param("userName")String userName);
+    void repairePlanStartDate2();
 
     void myUpdateConflictdes(@Param("apsProcessOperationProcessEquDo") ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo);
 }

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

@@ -855,8 +855,8 @@ public class ApsServiceImpl implements ApsService {
                     }
                 }
                 //还原排程过程中，开工/报工的作业的计划时间
-                apsProcessOperationProcessEquDao.repairePlanStartDate(currentUser.getId(), currentUser.getName());
-                apsProcessOperationProcessEquDao.repairePlanStartDate2(currentUser.getId(), currentUser.getName());
+                apsProcessOperationProcessEquDao.repairePlanStartDate();
+                apsProcessOperationProcessEquDao.repairePlanStartDate2();
 
                 if (StrUtil.isNotBlank(productionScheduleRetVo.getMsg())) {
                     // 排程异常后恢复历史排程结果为锁定状态

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -396,11 +396,8 @@
     <update id="repairePlanStartDate">
         update aps_process_operation_process_equ set
          PLANENDDATE = ACTUALFINISHDATE,
-         PLANSTARTDATE = ACTUALSTARTDATE,
+         PLANSTARTDATE = ACTUALSTARTDATE
 #          PLANSTARTDATE = DATE_SUB(ACTUALFINISHDATE,INTERVAL TIMESTAMPDIFF(SECOND,OLDPLANSTARTDATE,OLDPLANENDDATE) SECOND),
-         MODIFYDATE = NOW(),
-         MODIFYUSERID = #{userId},
-         MODIFYUSERNAME = #{userName}
         where DELETED = 0
           AND ACTUALFINISHDATE is not null
           AND OLDPLANSTARTDATE is not null
@@ -411,10 +408,7 @@
     <update id="repairePlanStartDate2">
         update aps_process_operation_process_equ set
              PLANSTARTDATE = ACTUALSTARTDATE,
-             PLANENDDATE = DATE_ADD(ACTUALSTARTDATE,INTERVAL TIMESTAMPDIFF(SECOND,OLDPLANSTARTDATE,OLDPLANENDDATE) SECOND),
-             MODIFYDATE = NOW(),
-             MODIFYUSERID = #{userId},
-             MODIFYUSERNAME = #{userName}
+             PLANENDDATE = DATE_ADD(ACTUALSTARTDATE,INTERVAL TIMESTAMPDIFF(SECOND,OLDPLANSTARTDATE,OLDPLANENDDATE) SECOND)
         where DELETED = 0
           AND ACTUALFINISHDATE is null
           AND ACTUALSTARTDATE is not null