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

fix:1期呼叫空托盘添加is_used校验

Browse Source
This commit is contained in:
zhangzq
2025-01-15 14:35:42 +08:00
parent df5d239a67
commit 85937ab49f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -521,9 +521,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(isLock)) { if (ObjectUtil.isEmpty(isLock)) {
if ("01".equals(placement_type) || "03".equals(placement_type)) { if ("01".equals(placement_type) || "03".equals(placement_type)) {
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq").uniqueResult(0); struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq").uniqueResult(0);
break;
} else { } else {
struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq desc").uniqueResult(0); struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq desc").uniqueResult(0);
}
if (!ObjectUtil.isEmpty(struct_jo)){
break; break;
} }
} else { } else {
@@ -548,8 +549,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
map.put("lock_type", "4"); map.put("lock_type", "4");
point_table.update(map, "point_code = '" + struct_jo.getString("struct_code") + "'"); point_table.update(map, "point_code = '" + struct_jo.getString("struct_code") + "'");
struct_table.update(map, "struct_code = '" + struct_jo.getString("struct_code") + "'"); struct_table.update(map, "struct_code = '" + struct_jo.getString("struct_code") + "'");
} }
if ("4".equals(type)) { if ("4".equals(type)) {
CutConveyorTask cutConveyorTask = new CutConveyorTask(); CutConveyorTask cutConveyorTask = new CutConveyorTask();

1
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -943,6 +943,7 @@
AND IFNULL( sa.storagevehicle_code, '' ) <> '' AND IFNULL( sa.storagevehicle_code, '' ) <> ''
AND sa.lock_type = '1' AND sa.lock_type = '1'
AND sa.is_delete = '0' AND sa.is_delete = '0'
AND sa.is_used = '1'
GROUP BY GROUP BY
sa.block_num, sa.block_num,
sa.row_num, sa.row_num,