From a33417f74d78a27cee8578138b1a699e11ff96a4 Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Thu, 14 Jul 2022 22:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=82=A8=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8F=AF=E5=87=BA=E5=85=A5=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/core/service/impl/DumpinvServiceImpl.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java
index 8c3307c..c4908ce 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java
@@ -82,11 +82,22 @@ public class DumpinvServiceImpl implements DumpinvService {
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
         map.put("label_uuid", label_uuid);
+        JSONObject materialObj = WQLObject.getWQLObject("md_base_materiallabelmst").query("label_uuid='" + label_uuid + "'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(materialObj)){
+            throw new BadRequestException("未找到该物料批次的信息!");
+        }
+        String material_code = materialObj.getString("material_code");
+        JSONArray turnInArr  = new JSONArray();
+        if (StrUtil.equals(material_code,"1")){
+            turnInArr  = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like'%一层%'").getResultJSONArray(0);
+        }else {
+            turnInArr  = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name  not like'%一层%'").getResultJSONArray(0);
+
+        }
 
         JSONArray turnOutArr = WQL.getWO("QST_DUMP01").addParamMap(map).process().getResultJSONArray(0);
         if (ObjectUtil.isNotEmpty(turnOutArr)) turnout_num = turnOutArr.size();
 
-        JSONArray turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0'").getResultJSONArray(0);
         if (ObjectUtil.isNotEmpty(turnInArr)) turnin_num = turnInArr.size();
 
         JSONObject result = new JSONObject();