fix:提示优化
This commit is contained in:
@@ -672,7 +672,7 @@ public class AutoCallAirShaftTask extends Prun {
|
||||
stepStr += ",30";
|
||||
if (!judgment1 && !judgment2) {
|
||||
log.warn("没有气胀轴,不给ACS写出轴信息");
|
||||
stepErrorInfo.add("呼叫气胀轴失败,没有气胀轴(密集库/暂存架),不给ACS写出轴信息");
|
||||
stepErrorInfo.add("呼叫气胀轴失败,(密集库/暂存架)没有"+qzzSize+"寸的气胀轴,不给ACS写出轴信息。请人工补轴或将对应的分切计划点击入站完成");
|
||||
stepStr += ",98";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -611,8 +611,8 @@ public class SlitterServiceImpl implements SlitterService {
|
||||
device.getSort_seq(),
|
||||
getPointLocationInCutDevice(getNumberByResourceCode(actualDeviceCode), area));
|
||||
if (emptyPoints.size() == 0) {
|
||||
log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位, 或已存在任务!");
|
||||
throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位,或已存在任务!");
|
||||
log.error("分切机【" + device.getExt_code() + "】对应的对接位有货, 或已存在任务!");
|
||||
throw new BadRequestException("分切机【" + device.getExt_code() + "】对应的对接位有货,或已存在任务!");
|
||||
}
|
||||
// 枷锁
|
||||
BstIvtCutpointivt emptyPoint = emptyPoints.get(0);
|
||||
|
||||
@@ -1066,7 +1066,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
|
||||
|
||||
public JSONObject getInspectionResult(JSONObject param) {
|
||||
|
||||
log.info("getInspectionResult接口输出参数为:-------------------" + param.toString());
|
||||
log.info("getInspectionResult接口输入参数为:-------------------" + param.toString());
|
||||
|
||||
|
||||
String container_name = param.getString("container_name");
|
||||
@@ -1097,6 +1097,12 @@ public class LmsToMesServiceImpl implements LmsToMesService {
|
||||
.timeout(time_out)//超时时间,毫秒
|
||||
.execute().body();
|
||||
result = JSONObject.parseObject(resultMsg);
|
||||
|
||||
String RTYPE = result.getString("RTYPE");
|
||||
if ("E".equals(RTYPE)) {
|
||||
throw new BadRequestException("MES提示错误:" +result.getString("RTMSG"));
|
||||
}
|
||||
|
||||
IpdmBiSubpackagerelationService subpackagerelationService = SpringContextHolder.getBean(IpdmBiSubpackagerelationService.class);
|
||||
JSONObject container_info = result.getJSONObject("RTDAT");
|
||||
System.out.println(container_info.toString());
|
||||
@@ -1212,13 +1218,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
|
||||
}
|
||||
log.info("getInspectionResult接口输出参数为:-------------------" + result.toString());
|
||||
|
||||
|
||||
String RTYPE = result.getString("RTYPE");
|
||||
if ("E".equals(RTYPE)) {
|
||||
throw new BadRequestException(result.getString("RTMSG"));
|
||||
}
|
||||
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new BadRequestException("MES提示错误:" + e.getMessage());
|
||||
}
|
||||
|
||||
@@ -486,7 +486,7 @@ public class BakingServiceImpl implements BakingService {
|
||||
|
||||
JSONArray pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().getResultJSONArray(0);
|
||||
if (ObjectUtil.isEmpty(pointArr)) {
|
||||
throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位!");
|
||||
throw new BadRequestException("出烘箱对接位,被货物或任务占用,请检查处理或等待!");
|
||||
}
|
||||
|
||||
// 2.判断暂存位是否有任务:找到无任务的暂存位
|
||||
@@ -505,7 +505,7 @@ public class BakingServiceImpl implements BakingService {
|
||||
}
|
||||
}
|
||||
if (ObjectUtil.isEmpty(point_code2)) {
|
||||
throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位!");
|
||||
throw new BadRequestException("出烘箱对接位,被货物或任务占用,请检查处理或等待!!");
|
||||
}
|
||||
|
||||
// 3.创建任务
|
||||
|
||||
@@ -421,7 +421,7 @@ public class FeedingServiceImpl implements FeedingService {
|
||||
map.put("point_location", cool_jo.getString("point_location").equals("0") ? "1" : "0");
|
||||
pointArr = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
|
||||
if (ObjectUtil.isEmpty(pointArr)) {
|
||||
throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位!");
|
||||
throw new BadRequestException("出烘箱对接位,被货物或任务占用,请检查处理或等待!!");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user