From c6f3aed22a09b5de8dac112ee364a2fe0ab6ca80 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 27 Dec 2024 14:28:04 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=87=BA=E5=BA=93=E5=8D=95=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=90=8E=E5=AF=BC=E8=87=B4=E5=88=86?= =?UTF-8?q?=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispatch_manage/task/handler/impl/OutStorageTask.java | 6 ++++++ .../iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java index ba8b80e6..d568f8e7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/OutStorageTask.java @@ -57,6 +57,12 @@ public class OutStorageTask extends AbstractTask { String target_point = from.getString("target_point"); //通过全局变量获取目标位置 String product_area = from.getString("product_area"); + if (StringUtils.isEmpty(product_area)){ + JSONObject formData = from.getJSONObject("form_data"); + if (!StringUtils.isEmpty(formData.getString("product_area"))){ + product_area = formData.getString("product_area"); + } + } if (StringUtils.isNotEmpty(product_area)){ String configTarget; if (vehicle_code.contains("T")){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml index e237e1ed..1da3e86a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml @@ -42,6 +42,6 @@ and st_ivt_iostorinv.source_form_code = #{query.source_form_code} - GROUP BY st_ivt_iostorinv.id + GROUP BY st_ivt_iostorinv.id order by st_ivt_iostorinv.id desc