root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

缓存区放料优化&&任务下发失败日志优化

Browse Source
This commit is contained in:
psh
2024-07-10 15:33:07 +08:00
parent 50c928af7a
commit 7141533201
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/AcsUtil.java
View File

@@ -51,7 +51,7 @@ public class AcsUtil {
String msg = e.getMessage(); String msg = e.getMessage();
//ConnectException: Connection refused: connect //ConnectException: Connection refused: connect
//网络不通 //网络不通
System.out.println(msg); log.error("连接失败：{}", msg);
result.put("status", HttpStatus.BAD_REQUEST); result.put("status", HttpStatus.BAD_REQUEST);
result.put("message", "网络不通,操作失败!"); result.put("message", "网络不通,操作失败!");
result.put("data", new JSONObject()); result.put("data", new JSONObject());

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/GHCMLTask.java
View File

@@ -116,10 +116,10 @@ public class GHCMLTask extends AbstractTask {
jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null); jsonObject.put("material_id", ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getMaterial_id() : null);
jsonObject.put("pcsn",ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getPcsn() : null); jsonObject.put("pcsn",ObjectUtil.isNotEmpty(groupInfo) ? groupInfo.getPcsn() : null);
SchBasePoint point = findNextPoint(nextRegionStr, jsonObject); SchBasePoint point = findNextPoint(nextRegionStr, jsonObject);
log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code());
if (ObjectUtil.isEmpty(point)) { if (ObjectUtil.isEmpty(point)) {
throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!"); throw new BadRequestException("涂板线[" + task.getPoint_code1() + "]未找到所需点位!");
} }
log.info("当前任务{}找到预计终点{}",task.getTask_id(),point.getPoint_code());
// 设置组盘 - 需要的话由子类自行实现 // 设置组盘 - 需要的话由子类自行实现
task.setGroup_id(setGroupPlate(jsonObject)); task.setGroup_id(setGroupPlate(jsonObject));
// 设置等待点并修改创建成功状态 // 设置等待点并修改创建成功状态

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/auto/mapper/AutoMapper.xml
View File

@@ -38,7 +38,7 @@
and vg.material_id=#{materialId} and vg.material_id=#{materialId}
and RIGHT(vg.pcsn,8)=RIGHT(#{pcsn},8) and RIGHT(vg.pcsn,8)=RIGHT(#{pcsn},8)
) )
ORDER BY p.row_num, p.col_num ORDER BY p.row_num, p.col_num desc
</select> </select>
<select id="getZCEmptyMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint"> <select id="getZCEmptyMaterialPoint" resultType="org.nl.wms.sch.point.service.dao.SchBasePoint">
SELECT p.* SELECT p.*