|
|
@ -85,6 +85,7 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
//公共参数 |
|
|
//公共参数 |
|
|
String site = inData.getSite(); |
|
|
String site = inData.getSite(); |
|
|
String rollNo = inData.getRollNo(); |
|
|
String rollNo = inData.getRollNo(); |
|
|
|
|
|
String orderNo = inData.getOrderNo(); |
|
|
String seqNo = inData.getSeqNo(); |
|
|
String seqNo = inData.getSeqNo(); |
|
|
//查询当前材料卷的信息 |
|
|
//查询当前材料卷的信息 |
|
|
Map<String, Object> resultPart = scheduleMapper.getRmRollData(inData); |
|
|
Map<String, Object> resultPart = scheduleMapper.getRmRollData(inData); |
|
|
@ -122,7 +123,7 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
//3.调用存储过程 检查当前的卷是否已经上机完成了 |
|
|
//3.调用存储过程 检查当前的卷是否已经上机完成了 |
|
|
Map<String, Object> resultMap = this.checkScanRmRollNo(site, seqNo, rollNo); |
|
|
|
|
|
|
|
|
Map<String, Object> resultMap = this.checkScanRmRollNo(site, orderNo, rollNo); |
|
|
//判断是否继续 |
|
|
//判断是否继续 |
|
|
String code = String.valueOf(resultMap.get("result_code")); |
|
|
String code = String.valueOf(resultMap.get("result_code")); |
|
|
if ("400".equalsIgnoreCase(code)) { |
|
|
if ("400".equalsIgnoreCase(code)) { |
|
|
@ -138,9 +139,10 @@ public class ScheduleServiceImpl implements ScheduleService { |
|
|
* @date 2024/6/7 9:20 |
|
|
* @date 2024/6/7 9:20 |
|
|
* @version 1.0 |
|
|
* @version 1.0 |
|
|
*/ |
|
|
*/ |
|
|
public Map<String, Object> checkScanRmRollNo(String site, String seqNo, String rollNo) { |
|
|
|
|
|
|
|
|
public Map<String, Object> checkScanRmRollNo(String site, String orderNo, String rollNo) { |
|
|
List<Object> params = new ArrayList<>(); |
|
|
List<Object> params = new ArrayList<>(); |
|
|
params.add(site); |
|
|
params.add(site); |
|
|
|
|
|
params.add(orderNo); |
|
|
params.add(rollNo); |
|
|
params.add(rollNo); |
|
|
//存储过程 调用存储过程 创建分卷 |
|
|
//存储过程 调用存储过程 创建分卷 |
|
|
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkDieCuttingScanRmRollNo", params); |
|
|
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkDieCuttingScanRmRollNo", params); |
|
|
|