opt:优化
This commit is contained in:
@@ -292,6 +292,8 @@ public class CallEmpReelTask extends AbstractAcsTask {
|
|||||||
// 创建桁架任务,入烘箱。
|
// 创建桁架任务,入烘箱。
|
||||||
JSONObject hotPoint = bean.getJsonObject(jsonIvt2.getString("product_area"), jsonIvt2, temperature);
|
JSONObject hotPoint = bean.getJsonObject(jsonIvt2.getString("product_area"), jsonIvt2, temperature);
|
||||||
String container_name = jsonTask.getString("material_code");
|
String container_name = jsonTask.getString("material_code");
|
||||||
|
//优化
|
||||||
|
if (ObjectUtil.isNotEmpty(hotPoint)) {
|
||||||
// 创建暂存位 --> 烘烤区任务
|
// 创建暂存位 --> 烘烤区任务
|
||||||
JSONObject param = new JSONObject();
|
JSONObject param = new JSONObject();
|
||||||
param.put("type", "2");
|
param.put("type", "2");
|
||||||
@@ -320,6 +322,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
|
|||||||
hotParam.put("temperature", temperature);
|
hotParam.put("temperature", temperature);
|
||||||
hotParam.put("oven_time", hours);
|
hotParam.put("oven_time", hours);
|
||||||
bean.createHotIoMst(hotParam);
|
bean.createHotIoMst(hotParam);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// 校验终点是否存在
|
// 校验终点是否存在
|
||||||
JSONObject jsonIvt2 = ivtTab.query("full_point_code ='" + point_code4 + "'").uniqueResult(0);
|
JSONObject jsonIvt2 = ivtTab.query("full_point_code ='" + point_code4 + "'").uniqueResult(0);
|
||||||
|
|||||||
@@ -128,9 +128,6 @@ public class OutHotTask extends AbstractAcsTask {
|
|||||||
jo.put("product_area", cut_jo.getString("product_area"));
|
jo.put("product_area", cut_jo.getString("product_area"));
|
||||||
jo.put("task_type", "010302");
|
jo.put("task_type", "010302");
|
||||||
} else {
|
} else {
|
||||||
if(ObjectUtil.isNotEmpty(cut_jo.getString("container_name"))){
|
|
||||||
throw new BadRequestException("点位:"+cut_jo.getString("full_point_code")+"已存在母卷:"+cut_jo.getString("container_name")+"");
|
|
||||||
}
|
|
||||||
jo.put("point_code1", jsonTask.getString("point_code2"));
|
jo.put("point_code1", jsonTask.getString("point_code2"));
|
||||||
jo.put("point_code2", cut_jo.getString("full_point_code"));
|
jo.put("point_code2", cut_jo.getString("full_point_code"));
|
||||||
jo.put("point_code3", cut_jo.getString("empty_point_code"));
|
jo.put("point_code3", cut_jo.getString("empty_point_code"));
|
||||||
|
|||||||
Reference in New Issue
Block a user