aps取消开工

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

@@ -47,7 +47,7 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
 
     List<ProcessIdRelationVo> getAllNextProcessOperationById(@Param("ids") List<String> ids);
 
-    @Update("update aps_process_operation set STARTINGROLL = STARTINGROLL - 1 where ID = #{processoperationid}")
+    @Update("update aps_process_operation set STARTINGROLL = STARTINGROLL - 1 ,,ACTUALSTARTDATE = if((STARTINGROLL - 1) <= 0,null,ACTUALSTARTDATE) where ID = #{processoperationid}")
     void updateByCancelRecord(@Param("processoperationid") String processoperationid);
 
     @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = concat(BACHMATERIALPROCESS,',',#{batchnumber}) where DELETED = 0 AND ID = #{processoperationid}")

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

@@ -102,6 +102,7 @@ implements ApsReportRecordsService {
         apsProcessOperationProcessEquDo.setId(equDo.getId());
         if(equDo.getStartingroll() == 0){
             apsProcessOperationProcessEquDo.setWorkstatus("待开工");
+            apsProcessOperationProcessEquDo.setActualstartdate(null);
         }
         if(equDo.getStartingroll() > 0 && equDo.getClosestatus().equals("未完工")){
             apsProcessOperationProcessEquDo.setWorkstatus("加工中");