DLC пре 8 месеци
родитељ
комит
fd6ff1ef09

+ 0 - 4
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationServiceImpl.java

@@ -2086,10 +2086,6 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                     Integer nextCurCancelRoll = (int) Math.floor((double) (curcancelroll * processOperationDo.getPlanprocessrall()) / apsProcessOperationDo.getPlanprocessrall());
                     cancelProcessOperationVo1.setCurcancelroll(nextCurCancelRoll);
                     processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
-                    if (cancelProcessOperationVo.getBhgCancel()) {
-                        processOperationDo.setInputunqualifiednum(processOperationDo.getInputunqualifiednum() + nextCurCancelRoll);
-                        cancelProcessOperationVo1.setBhgCancel(false);
-                    }
                     cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                     cancelProcessOperation(cancelProcessOperationVo1);
                 }

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

@@ -623,7 +623,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                 cancelProcessOperationVo.setSetincancelroll(false);
                 cancelProcessOperationVo.setUpdatecuropration(false);
-                cancelProcessOperationVo.setBhgCancel(true);
                 apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                 value = value - cancelQty;
             }
@@ -985,7 +984,6 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     cancelProcessOperationVo.setApsprocessoperationdo(apsProcessOperationDo);
                     cancelProcessOperationVo.setSetincancelroll(false);
                     cancelProcessOperationVo.setUpdatecuropration(false);
-                    cancelProcessOperationVo.setBhgCancel(true);
                     apsProcessOperationService.cancelProcessOperation(cancelProcessOperationVo);
                     value = value - cancelQty;
                 }

+ 0 - 2
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CancelProcessOperationVo.java

@@ -13,8 +13,6 @@ public class CancelProcessOperationVo {
     private Boolean setincancelroll = true;
     //是否更新本道作业明细
     private Boolean updatecuropration = true;
-    //是否因为检验不合格取消
-    private Boolean bhgCancel = false;
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }