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