aps-领料时校验直接使用剩余待开工卷数，计算是否待领料时使用工序作业的已取消卷数合计字段

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

@@ -3348,9 +3348,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         try {
             //查询坯料计划第一道工序作业的详情
             ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(req.getProcessId());
-            int needStartRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getCancelroll();
+            int needStartRoll = apsProcessOperationDo.getLeavewaitworkroll();
             if (batchNumberList.size() > needStartRoll) {
-                return R.error("领料数量不能大于计划加工卷数-已开工卷数-已取消卷数=" + needStartRoll);
+                return R.error("领料数量不能大于剩余待开工卷数=" + needStartRoll);
             }
 
             //查询目前的作业明细包含的批次号
@@ -3799,9 +3799,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(req.getBlankId());
             //查询坯料计划第一道工序作业的详情
             ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(req.getProcessId());
-            int needStartRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getCancelroll();
+            int needStartRoll = apsProcessOperationDo.getLeavewaitworkroll();
             if (batchNumberList.size() > needStartRoll) {
-                return R.error("领料数量不能大于计划加工卷数-已开工卷数-已取消卷数=" + needStartRoll);
+                return R.error("领料数量不能大于剩余待开工卷数=" + needStartRoll);
             }
 
             //原来的批次号

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

@@ -389,7 +389,7 @@
         IF(a.PREPAREMATERIAL = '否'
         and a.PRODUCTSTATUS = '30'
         and b.IFBLANKPROCESS = '否'
-        and (IF(a.PREPAREMATERIALBATCHNO = '' || a.PREPAREMATERIALBATCHNO is null,0,(LENGTH( a.PREPAREMATERIALBATCHNO ) - LENGTH( REPLACE ( a.PREPAREMATERIALBATCHNO, ',', '' ) ) + 1)) < (b.PLANPROCESSRALL-b.CANCELROLL) )
+        and (IF(a.PREPAREMATERIALBATCHNO = '' || a.PREPAREMATERIALBATCHNO is null,0,(LENGTH( a.PREPAREMATERIALBATCHNO ) - LENGTH( REPLACE ( a.PREPAREMATERIALBATCHNO, ',', '' ) ) + 1)) < (b.PLANPROCESSRALL-b.CANCELROLLSUM) )
         ,'是','否') AS 'ISWAITGETMATERIAL'
         from aps_blank_order a LEFT JOIN (select * from aps_process_operation where DELETED = 0 AND PREVIOUSPROCESSID is null) b ON a.ID = b.BLANKID
         where a.DELETED = 0