添加束卷方法参数 创建新卷 sxm 2022-3-15

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -121,6 +121,15 @@ public class SearchScheduleData extends BaseData {
     private String checkMultipleRoll; // 切换卷参数
     private String directPass;
     private String sFQCSlitFlag;     // 分卷参数
+    private Double newCreateRollQty;  // 异常下级卷数量
+
+    public Double getNewCreateRollQty() {
+        return newCreateRollQty;
+    }
+
+    public void setNewCreateRollQty(Double newCreateRollQty) {
+        this.newCreateRollQty = newCreateRollQty;
+    }
 
     public String getsFQCSlitFlag() {
         return sFQCSlitFlag;

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1925,8 +1925,8 @@ public class ScheduleServiceImpl implements ScheduleService {
             throw new RRException(msg);
         }
 
-        //2.调用存储过程 校验是否可以下机卷
-        Map<String, Object> checkMap2 = this.checkFinishRollWithSfdcRoll(site, orderNo, itemNo, seqNo, rollNo);
+        //2.调用存储过程 校验是否可以下机卷    todo  sxm 2022-3-15 添加参数 CreateNewRollFlag
+        Map<String, Object> checkMap2 = this.checkFinishRollWithSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, pageData.getCreateNewRollFlag());
         //判断是否检验成功
         String code2 = String.valueOf(checkMap2.get("resultCode"));
         if ("400".equalsIgnoreCase(code2)) {
@@ -1968,11 +1968,30 @@ public class ScheduleServiceImpl implements ScheduleService {
                 String msg = String.valueOf(resultMap.get("resultMsg"));
                 throw new RRException(msg);
             }
+            if("Y".equals(pageData.getCreateNewRollFlag())){
+                //调用存储过程校验每一个卷的数量
+                 this.finishRollProcessSFDCNewRoll(site, orderNo, itemNo, rollNo, seqNo,pageData.getNewCreateRollQty(),pageData.getOperatorId() );
+            }
             return resultMap;
         }
         return null;
     }
 
+    public void finishRollProcessSFDCNewRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo,Double newRollQty,String operatorId){
+
+            List<Object> params = new ArrayList<>();
+            params.add(site);
+            params.add(orderNo);
+            params.add(itemNo);
+            params.add(seqNo);
+            params.add(rollNo);
+            params.add(newRollQty);
+            params.add(operatorId);
+            //执行存储过程
+           procedureMapper.getProcedureData("finishRollProcessSFDCNewRoll", params);
+
+    }
+
     /**
      * @return java.util.Map<java.lang.String, java.lang.Object>
      * @Author LR
@@ -2027,15 +2046,17 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @Author LR
      * @Description
      * @DateTime 2022/1/25 13:55
-     * @Param [site, orderNo, itemNo, seqNo, rollNo]
+     * @Param [site, orderNo, itemNo, seqNo, rollNo]   // todo 添加是否创建新卷参数   sxm 2022 -3-15
      **/
-    public Map<String, Object> checkFinishRollWithSfdcRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) {
+    public Map<String, Object> checkFinishRollWithSfdcRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo,String createNewRollFlag) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
         params.add(itemNo);
         params.add(seqNo);
         params.add(rollNo);
+        // todo 添加是否创建新卷参数   sxm 2022 -3-15
+        params.add(createNewRollFlag);
         //执行存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkFinishRollWithSfdcRoll", params);
         //返回执行的结果
@@ -2114,8 +2135,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         //4.调用存储过程 处理SfdcMaterialHist的信息 --非主材
         this.finishRollProcessSfdcMaterialHistWithNotKeyRm(site, orderNo, itemNo, seqNo, rollNo, operatorId, reportedTime);
-        //5.调用存储过程 处理SfdcRoll和SfdcRoollOps
-        this.finishRollProcessSfdcRollAndOps(site, orderNo, itemNo, seqNo, rollNo, totalApprovedQty, sfdcApprovedQty, defectedQty, operatorName, reportedTime);
+        //5.调用存储过程 处理SfdcRoll和SfdcRoollOps   todo sxm 2022 -3 -15 添加参数 是否创建新卷
+        this.finishRollProcessSfdcRollAndOps(site, orderNo, itemNo, seqNo, rollNo, totalApprovedQty, sfdcApprovedQty, defectedQty, operatorName, reportedTime,pageData.getCreateNewRollFlag());
         //6.调用存储过程 处理Sfdc和派工单
         this.finishRollProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, rollNo, sfdcReportedQty, sfdcApprovedQty,
                 sfdcSetupTime, sfdcProdTime, sfdcDownTime, eventTime, tillTime, remark,
@@ -2189,7 +2210,7 @@ public class ScheduleServiceImpl implements ScheduleService {
      * @Param [site, orderNo, itemNo, seqNo, rollNo, totalApprovedQty, sfdcApproveQty, defectedQty]
      **/
     public void finishRollProcessSfdcRollAndOps(String site, String orderNo, Integer itemNo, String seqNo, String rollNo,
-                                                Float totalApprovedQty, Float sfdcApproveQty, Float defectedQty, String username, String reportedTime) {
+                                                Float totalApprovedQty, Float sfdcApproveQty, Float defectedQty, String username, String reportedTime,String createNewRollFlag) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(orderNo);
@@ -2201,6 +2222,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(defectedQty);
         params.add(username);
         params.add(reportedTime);
+        // todo sxm 2022 -3 -15 添加参数 createNewRollFlag
+        params.add(createNewRollFlag);
         //执行存储过程
         procedureMapper.execProduceData("finishRollProcessSfdcRollAndOps", params);
     }
@@ -3272,7 +3295,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
 
         //2.调用存储过程 校验是否可以下机卷
-        Map<String, Object> checkMap2 = this.checkFinishRollWithSfdcRoll(site, orderNo, itemNo, seqNo, rollNo);
+        Map<String, Object> checkMap2 = this.checkFinishRollWithSfdcRoll(site, orderNo, itemNo, seqNo, rollNo,pageData.getCreateNewRollFlag());
         //判断是否检验成功
         String code2 = String.valueOf(checkMap2.get("resultCode"));
         if ("400".equalsIgnoreCase(code2)) {
@@ -3605,6 +3628,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         params.add(inData.getsFQCSlitFlag());
         // 调用存储过程
         Map<String, Object> checkMap = workbenchCreateslittingrollFqcCheck("workbench_createslittingroll_fqc_check", params);
+        if(checkMap == null){
+            throw new RRException("存储过程未返回信息",400);
+        }
+
         //判断结果是否成功
         String checkCode = String.valueOf(checkMap.get("resultCode"));
         if ("400".equalsIgnoreCase(checkCode)) {
@@ -3650,6 +3677,9 @@ public class ScheduleServiceImpl implements ScheduleService {
     private Map<String, Object> workbenchCreateslittingrollFqcCheck(String procedureName, List<Object> params) {
         //调用存储过程
         List<Map<String, Object>> resultList = procedureMapper.getProcedureData(procedureName, params);
+        if(CollectionUtils.isEmpty(resultList)){
+            return null;
+        }
         //处理返回的结果
         return resultList.get(0);
     }
@@ -3788,8 +3818,11 @@ public class ScheduleServiceImpl implements ScheduleService {
             params.add(rollData.getRepairOrderFlag());
             params.add(rollData.getOperatorId());
             params.add(rollData.getCurrentDatetime());
-            params.add(rollData.getRemark());
+            params.add(" ");
             Map<String, Object> map = workbenchCreateslittingrollFqcCheck("workbench_postinspection", params);
+            if(map == null){
+                throw new RRException("存储过程未返回信息",400);
+            }
             if ("400".equals(map.get("resultCode"))){
                 throw new RRException(map.get("resultMsg").toString(),400);
             }
@@ -3803,7 +3836,6 @@ public class ScheduleServiceImpl implements ScheduleService {
         if(!currentRollFlag){
             inData.setRollNo(null);
         }
-
         return scheduleMapper.getReworkSfdcRollByCon(inData);
     }
 }