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

opt:优化代码

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2025-04-01 22:06:23 +08:00
parent 1fe6dc7104
commit 18fd707820
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -1707,7 +1707,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(Type)) { if (ObjectUtil.isEmpty(Type)) {
throw new BadRequestException("传入的类型不能为空！"); throw new BadRequestException("传入的类型不能为空！");
} }
//表处设备表
JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("ext_code = '" + ResourceName + "'").uniqueResult(0); JSONObject device_jo = WQLObject.getWQLObject("st_ivt_stpointivt").query("ext_code = '" + ResourceName + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(device_jo)) { if (ObjectUtil.isEmpty(device_jo)) {
throw new BadRequestException("未查询到[" + ResourceName + "]应的表处机设备！"); throw new BadRequestException("未查询到[" + ResourceName + "]应的表处机设备！");
@@ -1735,10 +1735,14 @@ public class MesToLmsServiceImpl implements MesToLmsService {
form.put("acs_task_type", "3"); form.put("acs_task_type", "3");
} else { } else {
//取满取空放满放空 //取满取空放满放空
//满轴
form.put("point_code1", jsonCoolIvt.getString("full_point_code")); form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
//放满
form.put("point_code2", device_jo.getString("up_point_code") + "_M"); form.put("point_code2", device_jo.getString("up_point_code") + "_M");
//取空
form.put("point_code3", device_jo.getString("up_point_code") + "_K"); form.put("point_code3", device_jo.getString("up_point_code") + "_K");
//判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位 //判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位
//01没有空轴
if (jsonCoolIvt.getString("empty_point_status").equals("01")) { if (jsonCoolIvt.getString("empty_point_status").equals("01")) {
form.put("point_code4", jsonCoolIvt.getString("empty_point_code")); form.put("point_code4", jsonCoolIvt.getString("empty_point_code"));
} else { } else {

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_RAWFOIL_01.wql
View File

@@ -340,7 +340,7 @@ IF 输入.flag = "6"
FROM FROM
ST_IVT_CoolPointIvt ivt ST_IVT_CoolPointIvt ivt
WHERE WHERE
ivt.empty_point_status = '02' ivt.empty_point_status = '01'
AND ivt.point_type = '1' AND ivt.point_type = '1'
AND AND
ivt.is_used = '1' ivt.is_used = '1'