From c7350749cd7ba7e6c89832dfbc11a49601d2a149 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 16 Feb 2023 18:18:29 +0800 Subject: [PATCH] =?UTF-8?q?mdf=EF=BC=9Aacs=E7=94=B3=E8=AF=B7=E8=BE=93?= =?UTF-8?q?=E9=80=81=E7=BA=BF=E4=BB=BB=E5=8A=A1=E8=BD=BD=E5=85=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/st/core/manage/AbstractInManage.java | 7 +++++-- .../wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java index bf19ec3f..a86e46f4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java @@ -679,8 +679,11 @@ public abstract class AbstractInManage { HashMap map = rows.get(0); //判断该载具是否已经分配货位或者起点 - JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '"+map.get("storagevehicle_code")+"' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0); - if (now_dis_rows.size()>0){ + HashMap paramMap = new HashMap<>(); + paramMap.put("flag", "11"); + paramMap.put("storagevehicle_code", map.get("storagevehicle_code")); + JSONArray iostorinvs = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(paramMap).process().getResultJSONArray(0); + if (iostorinvs.size()>0){ throw new BadRequestException("该载具已经分配过货位，无法继续分配！"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql index ce187095..d8d92471 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql @@ -432,6 +432,24 @@ ENDIF + IF 输入.flag = "11" + QUERY + SELECT + st_ivt_iostorinv.iostorinv_id, + st_ivt_iostorinvdis.* + FROM + st_ivt_iostorinv + LEFT JOIN st_ivt_iostorinvdis ON st_ivt_iostorinv.iostorinv_id = st_ivt_iostorinvdis.iostorinv_id + WHERE + storagevehicle_code = 输入.storagevehicle_code + AND st_ivt_iostorinvdis.work_status < '99' + AND ( st_ivt_iostorinvdis.struct_id <> '' AND st_ivt_iostorinvdis.struct_id IS NOT NULL ) + AND is_delete = 0 + ENDSELECT + ENDQUERY + ENDIF + +