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

rev:表处逻辑修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-03-14 09:31:47 +08:00
parent 207dac2778
commit 83cf6a3928
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,12 +136,13 @@ public class ProcessTask extends AbstractAcsTask {
HashMap map = new HashMap(); HashMap map = new HashMap();
map.put("container_name", ""); map.put("container_name", "");
map.put("full_vehicle_code", ""); map.put("full_vehicle_code", "");
map.put("full_point_status", "01");
ivtTab.update(map, "full_point_code = '" + point_code1 + "'"); ivtTab.update(map, "full_point_code = '" + point_code1 + "'");
//维护表处区点位 //维护表处区点位
HashMap map2 = new HashMap(); HashMap map2 = new HashMap();
map2.put("up_scroll", full_vehicle_code); map2.put("up_scroll", full_vehicle_code);
map2.put("up_pcsn", container_name); map2.put("up_pcsn", container_name);
stTab.update(map2, "point_code = '" + point_code2 + "'").uniqueResult(0); stTab.update(map2, "up_point_code = '" + point_code2 + "'").uniqueResult(0);
} }
if ("010703".equals(task_type)) { if ("010703".equals(task_type)) {
//维护表处区点位 //维护表处区点位

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

@@ -1501,9 +1501,9 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if ("1".equals(Type)) { if ("1".equals(Type)) {
String up_scroll = device_jo.getString("up_scroll"); String up_scroll = device_jo.getString("up_scroll");
String up_pcsn = device_jo.getString("up_pcsn"); String up_pcsn = device_jo.getString("up_pcsn");
if (StrUtil.isNotEmpty(up_pcsn)) { /*if (StrUtil.isNotEmpty(up_pcsn)) {
throw new BadRequestException("LMS系统上【" + ResourceName + "】表处机上还存在母卷号，不能进行上料！"); throw new BadRequestException("LMS系统上【" + ResourceName + "】表处机上还存在母卷号，不能进行上料！");
} }*/
//查询母卷所在点位 //查询母卷所在点位
JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0); JSONObject jsonCoolIvt = coolIvtTab.query("container_name = '" + containerName + "' and full_point_status = '02' and cool_ivt_status <> '04'").uniqueResult(0);
JSONObject form = new JSONObject(); JSONObject form = new JSONObject();

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

@@ -51,7 +51,7 @@
FROM FROM
ST_IVT_CoolPointIvt ivt ST_IVT_CoolPointIvt ivt
WHERE WHERE
ivt.empty_point_status = '02' ivt.empty_point_status = '01'
AND AND
ivt.full_point_status = '01' ivt.full_point_status = '01'
AND AND