车间作业跟踪加取消

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

@@ -83,8 +83,8 @@ public interface ApsProcessOperationDao extends BaseMapper<ApsProcessOperationDo
     @Select("SELECT * FROM aps_process_operation WHERE DELETED = 0 AND ID in ('${nextIds}')")
     List<ApsProcessOperationDo> getNextProcessOperations(@Param("nextIds") String nextIds);
 
-    @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND PROCESSID = #{processid} order by PLANSTARTDATE desc")
-    List<ApsProcessOperationProcessEquDo> getProcessOperationProcessEqus(@Param("processid") String processid);
+    @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND PROCESSID = #{processid} and IFNULL(CLOSESTATUS,'')='未完工' ${euqwhr} order by PLANSTARTDATE desc")
+    List<ApsProcessOperationProcessEquDo> getProcessOperationProcessEqus(@Param("processid") String processid, @Param("euqwhr") String euqwhr);
 
     @Select("SELECT * FROM aps_process_operation_process_equ WHERE DELETED = 0 AND ID in ('${nextIds}') and CLOSESTATUS='未完工' and PLANPROCESSRALL-STARTINGROLL-CANCELROLL>0")
     List<ApsProcessOperationProcessEquDo> getNextProcessOperationEqus(@Param("nextIds") String nextIds);

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

@@ -2049,6 +2049,10 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
 
             //本道工序作业
             ApsProcessOperationDo apsProcessOperationDo = cancelProcessOperationVo.getApsprocessoperationdo();
+            if (apsProcessOperationDo == null && StringUtils.isNotBlank(cancelProcessOperationVo.getProcessid())) {
+                apsProcessOperationDo = apsProcessOperationService.getById(cancelProcessOperationVo.getProcessid());
+            }
+
             if (cancelProcessOperationVo.getCancelreason().equals("1")) {//借调或取消
                 apsProcessOperationDo.setCancelroll(apsProcessOperationDo.getCancelroll() + curcancelroll);
             } else if (cancelProcessOperationVo.getCancelreason().equals("2")) {//输入取消
@@ -2116,7 +2120,11 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
             }
 
             //本道工序的作业明细
-            List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = apsProcessOperationDao.getProcessOperationProcessEqus(apsProcessOperationDo.getId());
+            String euqwhr = "";
+            if (StringUtils.isNotBlank(cancelProcessOperationVo.getProcessequid())) {
+                euqwhr = "and ID='" + cancelProcessOperationVo.getProcessequid() + "'";
+            }
+            List<ApsProcessOperationProcessEquDo> apsProcessOperationProcessEquDos = apsProcessOperationDao.getProcessOperationProcessEqus(apsProcessOperationDo.getId(), euqwhr);
             if (cancelProcessOperationVo.getUpdatecuropration()) {
                 Integer equWaitCancelRoll = curcancelroll;//明细的待分配取消卷数
                 Integer curEquCancelRoll = 0;//作业明细本次取消卷数
@@ -2202,6 +2210,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
     curEquCancelRoll:作业明细本次取消卷数
     apsProcessOperationDo:当前作业
     processOperationProcessEquDo：作业明细
+    cancelreason：取消原因
      */
     @Transactional
     public R cancelProcessOperationEqu(Integer curEquCancelRoll, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo processOperationProcessEquDo, String cancelreason) {

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

@@ -15,6 +15,10 @@ public class CancelProcessOperationVo {
     private Boolean updatecuropration = true;
     //本次取消原因    1-借调或取消 2-输入取消  3-输入不合格
     private String cancelreason = "1";
+    //作业ID
+    private String processid = "";
+    //作业明细ID
+    private String processequid = "";
     //修改的作业
     private ApsProcessOperationDo apsprocessoperationdo;
 }