Browse Source

开始生产的检查

master
rui_li 4 years ago
parent
commit
bafa22d5b4
  1. 14
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 9
      src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
  3. 95
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

14
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@ -706,6 +706,20 @@ public class ScheduleController {
.put("msg", "操作成功!"); .put("msg", "操作成功!");
} }
/**
* TODO 检查是否可以开始生产
* @author LR
* @date 2021/12/31 11:22
* @param inData
* @return com.gaotao.common.utils.R
**/
@RequestMapping(value = "checkStartProduce")
public R checkStartProduce(@RequestBody SearchScheduleData inData){
Map<String, Object> resultMap = scheduleService.checkStartProduce(inData);
return R.ok()
.put("resultMap", resultMap);
}

9
src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@ -391,4 +391,13 @@ public interface ScheduleService {
* @return void * @return void
**/ **/
void feedingMaterialRoll(SearchScheduleData inData); void feedingMaterialRoll(SearchScheduleData inData);
/**
* TODO 检查是否可以开始生产
* @author LR
* @date 2021/12/31 11:23
* @param inData
* @return java.util.Map<java.lang.String, java.lang.Object>
**/
Map<String, Object> checkStartProduce(SearchScheduleData inData);
} }

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

@ -1228,5 +1228,100 @@ public class ScheduleServiceImpl implements ScheduleService {
procedureMapper.execProduceData("feedingMaterialRoll", params); procedureMapper.execProduceData("feedingMaterialRoll", params);
} }
@Override
public Map<String, Object> checkStartProduce(SearchScheduleData inData) {
//公共参数
String site = inData.getSite();
String orderNo = inData.getOrderNo();
Integer itemNo = inData.getItemNo();
String seqNo = inData.getSeqNo();
String rollNo = inData.getRollNo();
//首先检查材料是否可以开始生产
Map<String, Object> materialMap = this.checkCompleteMaterialRoll(site, orderNo, itemNo, seqNo, rollNo);
//判断是否可以
String materialCode = String.valueOf(materialMap.get("resultCode"));
if (!"200".equalsIgnoreCase(materialCode)){
String materialMsg = String.valueOf(materialMap.get("resultMsg"));
throw new RRException(materialMsg);
}
//其次检查工具是否可以开始生产
Map<String, Object> toolMap = this.checkCompleteToolId(site, orderNo, itemNo, seqNo, rollNo);
//判断是否可以
String toolCode = String.valueOf(materialMap.get("resultCode"));
if (!"200".equalsIgnoreCase(toolCode)){
String toolMsg = String.valueOf(toolMap.get("resultMsg"));
throw new RRException(toolMsg);
}
//检查是否可以开始生产
Map<String, Object> resultMap = this.checkStartProduce(site, orderNo, itemNo, seqNo, rollNo);
//判断是否是异常
String resultCode = String.valueOf(resultMap.get("resultCode"));
if ("400".equalsIgnoreCase(resultCode)){
String resultMsg = String.valueOf(resultMap.get("resultMsg"));
throw new RRException(resultMsg);
}
return resultMap;
}
/**
* TODO 检查材料是否可以开始生产
* @author LR
* @date 2021/12/31 11:28
* @return java.util.Map<java.lang.String, java.lang.Object>
**/
public Map<String, Object> checkCompleteMaterialRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(orderNo);
params.add(itemNo);
params.add(seqNo);
params.add(rollNo);
//执行存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkCompleteMaterialRoll", params);
//返回执行的结果
return resultList.get(0);
}
/**
* TODO 检查工具是否可以开始生产
* @author LR
* @date 2021/12/31 11:30
* @return java.util.Map<java.lang.String, java.lang.Object>
**/
public Map<String, Object> checkCompleteToolId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(orderNo);
params.add(itemNo);
params.add(seqNo);
params.add(rollNo);
//执行存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkCompleteToolId", params);
//返回执行的结果
return resultList.get(0);
}
/**
* TODO是否可以开始生产
* @author LR
* @date 2021/12/31 13:18
* @return java.util.Map<java.lang.String, java.lang.Object>
**/
public Map<String, Object> checkStartProduce(String site, String orderNo, Integer itemNo, String seqNo, String rollNo) {
List<Object> params = new ArrayList<>();
params.add(site);
params.add(orderNo);
params.add(itemNo);
params.add(seqNo);
params.add(rollNo);
//执行存储过程
List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkStartProduce", params);
//返回执行的结果
return resultList.get(0);
}
} }
Loading…
Cancel
Save