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

问题修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-05 19:24:31 +08:00
parent 22c1b8dfe5
commit 6d57e7cb66
7 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,8 +129,6 @@ public class LmsToMesServiceImpl implements LmsToMesService {
if (RTYPE.equals("E")) { if (RTYPE.equals("E")) {
throw new BadRequestException(result.getString("RTMSG")); throw new BadRequestException(result.getString("RTMSG"));
} }
} catch (Exception e) { } catch (Exception e) {
throw new BadRequestException("MES提示错误：" + e.getMessage()); throw new BadRequestException("MES提示错误：" + e.getMessage());
} }

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -106,7 +106,7 @@ public class FeedingServiceImpl implements FeedingService {
String task_id = ""; String task_id = "";
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
if (StrUtil.isEmpty(cut_jo.getString("empty_vehicle_code"))) { if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) {
jo.put("point_code1", cool_ivt.getString("full_point_code")); jo.put("point_code1", cool_ivt.getString("full_point_code"));
jo.put("point_code2", cut_jo.getString("full_point_code")); jo.put("point_code2", cut_jo.getString("full_point_code"));
jo.put("vehicle_code", parent_container_name); jo.put("vehicle_code", parent_container_name);
@@ -271,7 +271,7 @@ public class FeedingServiceImpl implements FeedingService {
} }
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
if (StrUtil.equals("01", cut_jo.getString("empty_point_code"))) { if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) {
jo.put("point_code1", point_code); jo.put("point_code1", point_code);
jo.put("point_code2", next_point_code); jo.put("point_code2", next_point_code);
jo.put("vehicle_code", cool_jo.getString("container_name")); jo.put("vehicle_code", cool_jo.getString("container_name"));

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

@@ -51,7 +51,6 @@
WHERE WHERE
is_delete = '0' is_delete = '0'
AND is_used = '1' AND is_used = '1'
AND point_status = '1'
OPTION 输入.reging_id <> "" OPTION 输入.reging_id <> ""
region_id = 输入.reging_id region_id = 输入.reging_id
@@ -82,6 +81,7 @@
is_used = '1' is_used = '1'
AND full_point_status = '01' AND full_point_status = '01'
AND empty_point_status = '01' AND empty_point_status = '01'
AND is_used = '1'
AND NOT EXISTS ( AND NOT EXISTS (
SELECT SELECT

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java
View File

@@ -51,8 +51,8 @@ public class CoolOutServiceImpl
String point_code = whereJson.getString("point_code"); // 出库点位 String point_code = whereJson.getString("point_code"); // 出库点位
// 查询终点在冷却区是否存在 // 查询终点在冷却区是否存在
JSONObject jsonCoolIvt = coolIvtTab.query("point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0); JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("此点位不存在或是空位"+point_code); if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("点位："+point_code+"不符，请扫描冷却区满轴点位！");
// 更新点位状态 // 更新点位状态
jsonCoolIvt.put("full_point_status", "01"); jsonCoolIvt.put("full_point_status", "01");

9
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql
View File

@@ -59,13 +59,8 @@
FROM FROM
ST_IVT_CoolPointIvt coolIvt ST_IVT_CoolPointIvt coolIvt
LEFT JOIN PDM_BI_RawFoilWorkOrder der ON coolIvt.container_name = der.container_name LEFT JOIN PDM_BI_RawFoilWorkOrder der ON coolIvt.container_name = der.container_name
LEFT JOIN ST_IVT_HotRegionIOMst hotMst ON hotMst.container_name = coolIvt.container_name LEFT JOIN ( SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1 = 1 ORDER BY confirm_time ASC LIMIT 1 ) AS hotDtl1 ON hotDtl1.container_name = coolIvt.container_name
LEFT JOIN ( LEFT JOIN ( SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1 = 1 ORDER BY confirm_time DESC LIMIT 1 ) AS hotDtl2 ON hotDtl2.container_name = coolIvt.container_name
SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1=1 ORDER BY confirm_time ASC LIMIT 1
) AS hotDtl1 ON hotMst.iostorinv_id = hotDtl1.iostorinv_id
LEFT JOIN (
SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1=1 ORDER BY confirm_time DESC LIMIT 1
) AS hotDtl2 ON hotMst.iostorinv_id = hotDtl1.iostorinv_id
WHERE WHERE
coolIvt.full_point_status = '02' coolIvt.full_point_status = '02'

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -312,6 +312,8 @@ public class CoolCutTask extends AbstractAcsTask {
tab.insert(json); tab.insert(json);
this.immediateNotifyAcs(null);
return json.getString("task_id"); return json.getString("task_id");
} }

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java
View File

@@ -236,9 +236,6 @@ public class InHotTask extends AbstractAcsTask {
if (cutConveyorTask.isSingleTask(point_code1)) { if (cutConveyorTask.isSingleTask(point_code1)) {
throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
} }
if (cutConveyorTask.isSingleTask(point_code2)) {
throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
}
if (cutConveyorTask.isSingleTask(point_code3)) { if (cutConveyorTask.isSingleTask(point_code3)) {
throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！"); throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
} }