From bbca77088f2ed466c0d302710354a7d8e6e83621 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 25 Aug 2023 16:57:32 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=8B=E6=8C=81=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=8C=BA=E3=80=81=E5=8F=91=E8=B4=A7=E5=8C=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../st/service/impl/VirtualOutServiceImpl.java  | 11 ++++++++++-
 .../org/nl/wms/pda/st/wql/PDA_PRODUVTIONOUT.wql |  4 +++-
 .../org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql    | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
index 7652f740b..3ddb6028a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java
@@ -2,6 +2,7 @@
 package org.nl.wms.pda.st.service.impl;
 
 
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -68,6 +69,7 @@ public class VirtualOutServiceImpl implements VirtualOutService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public JSONObject ivtDisQuery(JSONObject whereJson) {
+        JSONObject jo = new JSONObject();
 
         JSONObject map = new JSONObject();
         map.put("flag", "2");
@@ -89,7 +91,14 @@ public class VirtualOutServiceImpl implements VirtualOutService {
             }
         }
 
-        JSONObject jo = new JSONObject();
+        if (ObjectUtil.isNotEmpty(whereJson.getString("box_no"))) {
+            JSONObject jsonSub = WQL.getWO("PDA_VIRTUALOUT").addParam("flag", "4").addParam("box_no", whereJson.getString("box_no")).process().uniqueResult(0);
+
+            jo.put("net_weight_num", ObjectUtil.isNotEmpty(jsonSub) ? NumberUtil.round(jsonSub.getString("net_weight_num"), 3) : "0");
+        } else {
+            jo.put("net_weight_num", "0");
+        }
+
         jo.put("data", resultJSONArray);
         jo.put("message", "查询成功!");
         return jo;
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_PRODUVTIONOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_PRODUVTIONOUT.wql
index 6334dc56a..953d35426 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_PRODUVTIONOUT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_PRODUVTIONOUT.wql
@@ -108,7 +108,8 @@
                 ROUND(sub.box_weight,3) AS box_weight,
                 sub.product_name,
                 sub.product_description,
-                sub.sale_order_name
+                sub.sale_order_name,
+                ROUND(sub.net_weight_num,3) AS net_weight_num
             FROM
             	sch_base_point point
             	LEFT JOIN (
@@ -126,6 +127,7 @@
             	    SELECT
                         package_box_sn,
                         MAX(box_weight) AS box_weight,
+                        sum(net_weight) AS net_weight_num,
                         MAX(product_name) AS product_name,
                         MAX(product_description) AS product_description,
                         MAX(sale_order_name) AS sale_order_name
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
index a02769a91..5233badd4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql
@@ -153,6 +153,23 @@
             WHERE
                 code = 'ST_INV_OUT_TYPE'
 
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+	IF 输入.flag = "4"
+		QUERY
+			SELECT
+			    sum(net_weight) AS net_weight_num
+            FROM
+            	pdm_bi_subpackagerelation
+            WHERE
+                1 = 1
+
+                OPTION 输入.box_no <> ""
+                    package_box_sn = 输入.box_no
+                ENDOPTION
+
 			ENDSELECT
 		ENDQUERY
 	ENDIF
\ No newline at end of file