取消作业调整

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

@@ -53,5 +53,5 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
 
     R cancelProcessOperation(CancelProcessOperationVo cancelProcessOperationVo);
 
-    R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, boolean bhgCancel);
+    R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, String bhgCancel);
 }

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

@@ -3356,7 +3356,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                  */
                 if (secondroll > needBorrowOperationEqu.getCancelroll()) {
                     needBorrowOperationEqu.setSecondroll(secondroll);
-                    R r = apsProcessOperationService.cancelProcessOperationEqu(1, needBorrowOperation, needBorrowOperationEqu, false);
+                    R r = apsProcessOperationService.cancelProcessOperationEqu(1, needBorrowOperation, needBorrowOperationEqu, "1");
                     if (!r.getCode().equals("200")) {
                         throw new CustomException(r.getMsg());
                     }

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

@@ -2036,11 +2036,17 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
-            if (cancelProcessOperationVo.getSetincancelroll()) {
+            if (cancelProcessOperationVo.getCancelreason().equals("1")) {
                 apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
+            } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {
+                apsProcessOperationDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll() + curcancelroll);
+            } else if (cancelProcessOperationVo.getCancelreason().equals("3")) {
+                apsProcessOperationDo.setInputunqualifiednum(apsProcessOperationDo.getInputunqualifiednum() + curcancelroll);
+                apsProcessOperationDo.setInputunqualifiedroll(apsProcessOperationDo.getInputunqualifiedroll() + curcancelroll);
             }
-            apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll());
-            Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll();
+            apsProcessOperationDo.setCancelrollsum(apsProcessOperationDo.getCancelrollsum() + curcancelroll);
+            apsProcessOperationDo.setLeavewaitworkroll(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getStartingroll() - apsProcessOperationDo.getCancelrollsum());
+            Integer leaveWaitJobRoll = apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getReportroll() - apsProcessOperationDo.getCancelrollsum();
             apsProcessOperationDo.setLeavewaitjobroll(leaveWaitJobRoll);
             apsProcessOperationDo.setProcesstotaltime(new BigDecimal(df.format(BigDecimal.valueOf(apsProcessOperationDo.getPlanprocessrall() - apsProcessOperationDo.getInputunqualifiedroll() - apsProcessOperationDo.getCancelroll()).multiply(apsProcessOperationDo.getOnceprocessmin()))));
             if (leaveWaitJobRoll == 0) {
@@ -2081,11 +2087,16 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                 for (ApsProcessOperationDo processOperationDo : apsProcessOperationDos) {
                     CancelProcessOperationVo cancelProcessOperationVo1 = new CancelProcessOperationVo();
                     cancelProcessOperationVo1.setCraftrouteid(craftrouteid);
-                    cancelProcessOperationVo1.setSetincancelroll(false);
+//                    cancelProcessOperationVo1.setSetincancelroll(false);
                     cancelProcessOperationVo1.setUpdatecuropration(false);
                     Integer nextCurCancelRoll = (int) Math.floor((double) (curcancelroll * processOperationDo.getPlanprocessrall()) / apsProcessOperationDo.getPlanprocessrall());
                     cancelProcessOperationVo1.setCurcancelroll(nextCurCancelRoll);
-                    processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
+                    if (cancelProcessOperationVo.getCancelreason().equals("3")) {
+                        cancelProcessOperationVo1.setCancelreason("3");
+                    } else {
+                        cancelProcessOperationVo1.setCancelreason("2");
+                    }
+//                    processOperationDo.setInputunqualifiedroll(processOperationDo.getInputunqualifiedroll() + nextCurCancelRoll);
                     cancelProcessOperationVo1.setApsprocessoperationdo(processOperationDo);
                     cancelProcessOperation(cancelProcessOperationVo1);
                 }
@@ -2108,7 +2119,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                             curEquCancelRoll = tempRoll;
                         }
                         //取消和更新作业明细
-                        cancelProcessOperationEqu(curEquCancelRoll, apsProcessOperationDo, processOperationProcessEquDo, false);
+                        cancelProcessOperationEqu(curEquCancelRoll, apsProcessOperationDo, processOperationProcessEquDo, cancelProcessOperationVo.getCancelreason());
                     } else {
                         break;
                     }
@@ -2180,11 +2191,18 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     processOperationProcessEquDo：作业明细
      */
     @Transactional
-    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, boolean bhgCancel) {
+    public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, String cancelreason) {
         processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
-        if (bhgCancel) {
+        if (cancelreason.equals("1")) {
+            processOperationProcessEquDo.setCancelrollno(processOperationProcessEquDo.getCancelrollno() + curEquCancelRoll);
+        } else if (cancelreason.equals("2")) {
+            processOperationProcessEquDo.setInputunqualifiedroll(processOperationProcessEquDo.getInputunqualifiedroll() + curEquCancelRoll);
+        } else if (cancelreason.equals("3")) {
             processOperationProcessEquDo.setInputunqualifiednum(processOperationProcessEquDo.getInputunqualifiednum() + curEquCancelRoll);
+            processOperationProcessEquDo.setInputunqualifiedroll(processOperationProcessEquDo.getInputunqualifiedroll() + curEquCancelRoll);
         }
+        processOperationProcessEquDo.setCancelroll(processOperationProcessEquDo.getCancelroll() + curEquCancelRoll);
+        processOperationProcessEquDo.setLeavewaitworkroll(processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getStartingroll() - processOperationProcessEquDo.getCancelroll());
         List<String> noUpdatePlanenddateList = Arrays.asList("小卷成退", "中退", "成退");
         if (processOperationProcessEquDo.getPlanprocessrall() == processOperationProcessEquDo.getCancelroll()) {
             processOperationProcessEquDo.setProcessdevice("");
@@ -2196,11 +2214,12 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             calendar.add(Calendar.SECOND, addMinute.setScale(0, RoundingMode.UP).intValue());
             processOperationProcessEquDo.setPlanenddate(calendar.getTime());
         }
-        if (processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getReportroll() - processOperationProcessEquDo.getCancelroll() == 0) {
+        Integer leaveWaitJobRoll = processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getReportroll() - processOperationProcessEquDo.getCancelroll();
+        if (leaveWaitJobRoll == 0) {
             processOperationProcessEquDo.setClosestatus(SaveConstans.CloseStatus.COMPLETED);
             processOperationProcessEquDo.setActualfinishdate(DateUtil.date());
             processOperationProcessEquDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_END);
-        } else if (processOperationProcessEquDo.getPlanprocessrall() - processOperationProcessEquDo.getReportroll() - processOperationProcessEquDo.getCancelroll() > 0) {
+        } else if (leaveWaitJobRoll > 0) {
             processOperationProcessEquDo.setClosestatus(SaveConstans.CloseStatus.UNFINISHED);
             if (processOperationProcessEquDo.getStartingroll() == 0) {
                 processOperationProcessEquDo.setWorkstatus(SaveConstans.JobStatus.JOBSTATUS_TO_BE_START);
@@ -2213,7 +2232,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         if (StringUtils.isNotBlank(processOperationProcessEquDo.getNextprocessesids())) {
             List<ApsProcessOperationProcessEquDo> processOperationProcessEquDos = apsProcessOperationDao.getNextProcessOperationEqus(processOperationProcessEquDo.getNextprocessesids().replace(",", "','"));
             for (ApsProcessOperationProcessEquDo processOperationEquDo : processOperationProcessEquDos) {
-                cancelProcessOperationEqu((int) Math.floor((double) (curEquCancelRoll * processOperationEquDo.getPlanprocessrall()) / processOperationProcessEquDo.getPlanprocessrall()), apsProcessOperationDo, processOperationEquDo, false);
+                if (!cancelreason.equals("3")) {
+                    cancelreason = "2";
+                }
+                cancelProcessOperationEqu((int) Math.floor((double) (curEquCancelRoll * processOperationEquDo.getPlanprocessrall()) / processOperationProcessEquDo.getPlanprocessrall()), apsProcessOperationDo, processOperationEquDo, cancelreason);
             }
         }
 

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

@@ -615,7 +615,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                 apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
                 apsProcessOperationDo.setInputunqualifiednum(cancelQty + apsProcessOperationDo.getInputunqualifiednum());
                 //取消和更新作业明细
-                apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, true);
+                apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, "3");
                 //取消和更新工序作业
                 cancelProcessOperationVo = new CancelProcessOperationVo();
                 cancelProcessOperationVo.setCraftrouteid(null);
@@ -976,7 +976,7 @@ public class ReportCheckServiceImpl implements ReportCheckService {
                     // 改为取消方法更新作业输入已取消卷数
                     apsProcessOperationDo.setInputunqualifiedroll(cancelQty + apsProcessOperationDo.getInputunqualifiedroll());
                     //取消和更新作业明细
-                    apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, true);
+                    apsProcessOperationService.cancelProcessOperationEqu(cancelQty, apsProcessOperationDo, apsProcessOperationProcessEquDo, "3");
                     //取消和更新工序作业
                     cancelProcessOperationVo = new CancelProcessOperationVo();
                     cancelProcessOperationVo.setCraftrouteid(null);

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationBackupDo.java

@@ -12,9 +12,10 @@ import java.util.Date;
 
 /**
  * 生产订单-坯料计划-工序作业
+ *
  * @TableName aps_process_operation_backup
  */
-@TableName(value ="aps_process_operation_backup")
+@TableName(value = "aps_process_operation_backup")
 @Data
 public class ApsProcessOperationBackupDo extends BaseDo implements Serializable {
     /**
@@ -24,7 +25,7 @@ public class ApsProcessOperationBackupDo extends BaseDo implements Serializable
     private String id;
 
     /**
-     * 
+     *
      */
     private String tenantid;
 
@@ -434,7 +435,6 @@ public class ApsProcessOperationBackupDo extends BaseDo implements Serializable
      */
     private BigDecimal singlerollweight;
     /**
-     *
      * 计时方式
      */
     private String timeway;
@@ -483,7 +483,10 @@ public class ApsProcessOperationBackupDo extends BaseDo implements Serializable
      * 输入不合格卷数
      */
     private Integer inputunqualifiednum;
-
+    /**
+     * 已取消卷数合计
+     */
+    private Integer cancelrollsum;
 
 
     @TableField(exist = false)

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationDo.java

@@ -1,16 +1,16 @@
 package com.rongwei.bsentity.domain;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 生产订单-坯料计划-工序作业
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
 @TableName("aps_process_operation")
 public class ApsProcessOperationDo extends BaseDo {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键ID
@@ -446,7 +446,6 @@ public class ApsProcessOperationDo extends BaseDo {
     private String lockmark;
 
     /**
-     *
      * 计时方式
      */
     @TableField("TIMEWAY")
@@ -481,6 +480,11 @@ public class ApsProcessOperationDo extends BaseDo {
      */
     @TableField("INPUTUNQUALIFIEDNUM")
     private Integer inputunqualifiednum;
+    /**
+     * 已取消卷数合计
+     */
+    @TableField("CANCELROLLSUM")
+    private Integer cancelrollsum;
 
 
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationHistoryDo.java

@@ -473,6 +473,11 @@ public class ApsProcessOperationHistoryDo extends BaseDo {
      */
     @TableField("INPUTUNQUALIFIEDNUM")
     private Integer inputunqualifiednum;
+    /**
+     * 已取消卷数合计
+     */
+    @TableField("CANCELROLLSUM")
+    private Integer cancelrollsum;
 
 
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquBackupDo.java

@@ -153,7 +153,7 @@ public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Ser
      */
     private String doingbatchnumber;
     /**
-     * 已取消卷数
+     * 已取消卷数合计
      */
     private Integer cancelroll;
     /**
@@ -172,4 +172,20 @@ public class ApsProcessOperationProcessEquBackupDo extends BaseDo implements Ser
      * 输入不合格卷数
      */
     private Integer inputunqualifiednum;
+    /**
+     * 输入已取消卷数
+     */
+    private Integer inputunqualifiedroll;
+    /**
+     * 已取消卷数
+     */
+    private Integer cancelrollno;
+    /**
+     * 剩余待报工卷数
+     */
+    private Integer leavewaitjobroll;
+    /**
+     * 剩余待开工卷数
+     */
+    private Integer leavewaitworkroll;
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOperationProcessEquDo.java

@@ -175,7 +175,7 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
     @TableField("DOINGBATCHNUMBER")
     private String doingbatchnumber;
     /**
-     * 已取消卷数
+     * 已取消卷数合计
      */
     @TableField("CANCELROLL")
     private Integer cancelroll;
@@ -199,4 +199,24 @@ public class ApsProcessOperationProcessEquDo extends BaseDo {
      */
     @TableField("INPUTUNQUALIFIEDNUM")
     private Integer inputunqualifiednum;
+    /**
+     * 输入已取消卷数
+     */
+    @TableField("INPUTUNQUALIFIEDROLL")
+    private Integer inputunqualifiedroll;
+    /**
+     * 已取消卷数
+     */
+    @TableField("CANCELROLLNO")
+    private Integer cancelrollno;
+    /**
+     * 剩余待报工卷数
+     */
+    @TableField("LEAVEWAITJOBROLL")
+    private Integer leavewaitjobroll;
+    /**
+     * 剩余待开工卷数
+     */
+    @TableField("LEAVEWAITWORKROLL")
+    private Integer leavewaitworkroll;
 }

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

@@ -13,6 +13,8 @@ public class CancelProcessOperationVo {
     private Boolean setincancelroll = true;
     //是否更新本道作业明细
     private Boolean updatecuropration = true;
+    //本次取消原因    1-借调或取消 2-输入取消  3-输入不合格
+    private String cancelreason = "1";
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }