取消作业调整

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

@@ -613,6 +613,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 log.debug("工序作业:{}的本次取消卷数:{}", apsProcessOperationProcessEquDo.getId(), cancelQty);
                 // 改为取消方法更新作业输入已取消卷数
                 apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
+                apsProcessOperationDo.setInputunqualifiednum(cancelQty + apsProcessOperationDo.getInputunqualifiednum());
                 //取消和更新作业明细
                 apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, true);
                 //取消和更新工序作业
@@ -984,6 +985,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                     cancelProcessOperationVo.setSetincancelroll(false);
                     cancelProcessOperationVo.setUpdatecuropration(false);
+                    cancelProcessOperationVo.setBhgCancel(true);
                     apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                     value = value - cancelQty;
                 }