aps-小卷取消开工相关逻辑增加

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

@@ -60,8 +60,8 @@ public interface ApsProcessOperationProcessEquDao extends BaseMapper<ApsProcessO
     @Select("select PRODUCTIONORDERID AS 'orderId',MIN(PRODUCTSTATUS) AS 'minProductionStatus',MAX(PRODUCTSTATUS) AS 'maxProductionStatus' from aps_blank_order where DELETED = 0 AND PRODUCTIONORDERID = (select PRODUCTIONORDERID from aps_blank_order where ID = #{blankId}) GROUP BY PRODUCTIONORDERID")
     CommonUpdateProductionStatusReq selectBlankMinAndMaxStatus(@Param("blankId") String blankId);
 
-    @Update("update aps_process_operation_process_equ set STARTINGROLL = STARTINGROLL - 1,WAITREPORTID = null,DOINGBATCHNUMBER = '' where ID = #{processequid}")
-    void updateByCancelRecord(@Param("processequid") String processequid);
+    @Update("update aps_process_operation_process_equ set STARTINGROLL = STARTINGROLL - ${reduceNum},WAITREPORTID = null,DOINGBATCHNUMBER = '' where ID = #{processequid}")
+    void updateByCancelRecord(@Param("processequid") String processequid, @Param("reduceNum") Integer reduceNum);
 
 //    @Update("update asp_check_items set WAITREPORTID = REPLACE(REPLACE(REPLACE(WAITREPORTID,'${recordId},',''),',${recordId}',''),'${recordId}','') where ID = #{deviceId}")
 //    void updateEquByCancelRecord(@Param("recordId") String recordId,@Param("deviceId") String deviceId);

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

@@ -117,14 +117,15 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         //工序作业明细ID
         String processequid = recordsDo.getProcessequid();
 
-        //更新该工序作业的作业明细的作业状态字段、已开工卷数、明细的待报工记录ID=（空），加工中批次号=(空)
-        apsProcessOperationProcessEquDao.updateByCancelRecord(processequid);
-
-        //更新该工序作业的已开工卷数-x(默认为1)
         int reduceNum = 1;
         if (batchNumberList.size() > 0) {
             reduceNum = batchNumberList.size();
         }
+
+        //更新该工序作业的作业明细的作业状态字段、已开工卷数、明细的待报工记录ID=（空），加工中批次号=(空)
+        apsProcessOperationProcessEquDao.updateByCancelRecord(processequid, reduceNum);
+
+        //更新该工序作业的已开工卷数-x(默认为1)
         apsProcessOperationDao.updateByCancelRecord(processoperationid, reduceNum);
 
         //查询作业明细详情