aps-开工后增加接口检验是否存在未开工的合并工序

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.domain.ApsCheckParameterDo;
 import com.rongwei.bsentity.domain.ApsParameterDo;
+import com.rongwei.bsentity.domain.ApsProcessOperationProcessEquDo;
 import com.rongwei.bsentity.domain.ApsReportRecordsDo;
 import com.rongwei.bsentity.vo.OrganizationCodeAndDeviceCodeVo;
 import org.apache.ibatis.annotations.Delete;
@@ -10,6 +11,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -52,6 +54,9 @@ public interface ApsReportRecordsDao extends BaseMapper<ApsReportRecordsDo> {
 
     @Update("update aps_process_operation_process_equ set BACHMATERIALPROCESS = REPLACE(REPLACE(REPLACE(BACHMATERIALPROCESS,'${inputBatchNumber},',''),',${inputBatchNumber}',''),'${inputBatchNumber}','') where DELETED = 0 AND PREVIOUSPROCESSESIDS = #{previousprocessesids}")
     void updateAllProcessEquBatchNumber(@Param("inputBatchNumber") String inputBatchNumber, @Param("previousprocessesids") String previousprocessesids);
+
+    @Select("select * from aps_process_operation_process_equ where DELETED = 0 AND ID != #{id} AND PROCESSDEVICEID = #{processdeviceid} AND PLANSTARTDATE = #{planstartdate} AND (WAITREPORTID is null or WAITREPORTID = '')")
+    List<ApsProcessOperationProcessEquDo> selectOtherMergeProcessEqu(@Param("id") String id, @Param("processdeviceid") String processdeviceid, @Param("planstartdate") Date planstartdate);
 }
 
 

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

@@ -18,4 +18,6 @@ public interface ApsReportRecordsService extends IService<ApsReportRecordsDo> {
     R startReport(StartRePortReq req);
 
     R saveReport(SaveReportReq req);
+
+    R checkMergeProcess(ApsReportRecordsDo req);
 }

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

@@ -569,7 +569,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         List<ApsReportBlankCompentDo> apsReportBlankCompentDoList = req.getApsReportBlankCompentDoList();
 
         for (ApsReportOutputDo apsReportOutputDo : apsReportOutputDoList) {
-            if(ObjectUtil.isEmpty(apsReportOutputDo.getInsepctionlevel())){
+            if (ObjectUtil.isEmpty(apsReportOutputDo.getInsepctionlevel())) {
                 return R.error("检验等级不能为空");
             }
         }
@@ -856,6 +856,26 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
         }
     }
 
+    @Override
+    public R checkMergeProcess(ApsReportRecordsDo req) {
+        //作业明细的ID
+        String processequid = req.getProcessequid();
+        //当前报工的作业明细的详情
+        ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(processequid);
+        //查询其他 与当前作业明细计划开工时间相同，并且未开工（待报工记录ID为空）的作业明细
+        List<ApsProcessOperationProcessEquDo> list = this.baseMapper.selectOtherMergeProcessEqu(apsProcessOperationProcessEquDo.getId(), apsProcessOperationProcessEquDo.getProcessdeviceid(), apsProcessOperationProcessEquDo.getPlanstartdate());
+        CheckMergeProcessResopnse res = new CheckMergeProcessResopnse();
+        if (list.size() > 0) {
+            //查询当前工序作业明细的工序详情
+            ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(req.getProcessoperationid());
+            res.setNeedWarning(true);
+            res.setWarningMessage("该合并作业" + apsProcessOperationDo.getProcess() + "还有其他作业需要一起开工，请及时开工");
+            return R.ok(res);
+        }
+
+        return R.ok(res);
+    }
+
 }
 
 

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

@@ -0,0 +1,16 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+/**
+ * @author ：sc
+ * @since ：2024/7/17
+ */
+@Data
+public class CheckMergeProcessResopnse {
+    //是否需要提醒
+    private Boolean needWarning = false;
+
+    //提醒内容
+    private String warningMessage;
+}

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

@@ -2,6 +2,7 @@ package com.rongwei.bsserver.controller;
 
 
 import com.rongwei.bscommon.sys.service.ApsReportRecordsService;
+import com.rongwei.bsentity.domain.ApsReportRecordsDo;
 import com.rongwei.bsentity.vo.SaveReportReq;
 import com.rongwei.bsentity.vo.StartRePortReq;
 import com.rongwei.rwcommon.base.R;
@@ -60,5 +61,13 @@ public class ApsReportRecordController {
     public R saveReport(@RequestBody SaveReportReq req){
         return apsReportRecordsService.saveReport(req);
     }
+
+    /**
+     * 开工之后，查询是否存在未开工的合并工序
+     */
+    @PostMapping("/checkMergeProcess")
+    public R checkMergeProcess(@RequestBody ApsReportRecordsDo req){
+        return apsReportRecordsService.checkMergeProcess(req);
+    }
 }