From 85937ab49f3f33709a72a1a0bbbd0839b4650855 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 15 Jan 2025 14:35:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:1=E6=9C=9F=E5=91=BC=E5=8F=AB=E7=A9=BA?= =?UTF-8?q?=E6=89=98=E7=9B=98=E6=B7=BB=E5=8A=A0is=5Fused=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 5 ++--- .../java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ac9fd93ad..2f77454e4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -521,9 +521,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(isLock)) { 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); - break; } 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); + } + if (!ObjectUtil.isEmpty(struct_jo)){ break; } } else { @@ -548,8 +549,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { map.put("lock_type", "4"); point_table.update(map, "point_code = '" + struct_jo.getString("struct_code") + "'"); struct_table.update(map, "struct_code = '" + struct_jo.getString("struct_code") + "'"); - - } if ("4".equals(type)) { CutConveyorTask cutConveyorTask = new CutConveyorTask(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index 6b03d0ca3..54f3dae62 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -943,6 +943,7 @@ AND IFNULL( sa.storagevehicle_code, '' ) <> '' AND sa.lock_type = '1' AND sa.is_delete = '0' + AND sa.is_used = '1' GROUP BY sa.block_num, sa.row_num,