feature 增加忽略冲突的接口

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

@@ -42,4 +42,6 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     R backupProcessOperation();
 
     R backupRestoreProcessOperation();
+
+    R cancelConflict(List<String> ids);
 }

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

@@ -20,6 +20,7 @@ import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
 import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
 import com.rongwei.rwadmincommon.system.vo.SysOrganizationVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.BaseDo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
@@ -36,6 +37,8 @@ import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_N;
+import static com.rongwei.safecommon.utils.SaveConstans.LockmarkType.LOCKMARK_Y;
 import static com.rongwei.safecommon.utils.SaveConstans.MINUS_ONE;
 
 /**
@@ -1008,6 +1011,37 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         return R.ok();
     }
 
+    /**
+     * 忽略冲突
+     * @param ids
+     * @return
+     */
+    @Override
+    public R cancelConflict(List<String> ids) {
+        List<String> collect = ids.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
+        if(collect.isEmpty()){
+            log.error("参数异常");
+            return R.error("参数异常");
+        }
+        List<ApsProcessOperationProcessEquDo> list = apsProcessOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                .in(ApsProcessOperationProcessEquDo::getProcessid, ids)
+                .eq(BaseDo::getDeleted, "0"));
+        if(list.isEmpty()){
+            log.error("无法根据工序作业ID:{} 获取到工序作业明细",ids);
+            return R.error("无法找到工序作业明细");
+        }
+        list.forEach(info->{
+            info.setConflictdes("");
+            if(StringUtils.isBlank(info.getConflictdes()) && StringUtils.isBlank(info.getSoftconflictdes())){
+                info.setHasconflict(LOCKMARK_N);
+            }else{
+                info.setHasconflict(LOCKMARK_Y);
+            }
+        });
+        apsProcessOperationProcessEquService.updateBatchById(list);
+        return R.ok();
+    }
+
     //根据工序ID更新，明细和工序的状态
     private String updateProcessByProcessId(String processId, String orderId) {
         //=============迭代开始，更新当前工序及其明细==================

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationController.java

@@ -125,5 +125,14 @@ public class ApsProcessOperationController {
         return apsProcessOperationService.backupRestoreProcessOperation();
     }
 
+    /**
+     * 取消工序作业的冲突
+     * @return
+     */
+    @PostMapping("/cancel/conflict")
+    public R cancelConflict(@RequestBody List<String> ids) {
+        return apsProcessOperationService.cancelConflict(ids);
+    }
+
 }