From 3e808280adb44e96a684cb711a844f031e2e4fe2 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 19 Mar 2024 15:26:52 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=9F=E5=AE=A1=E6=A0=B8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProductScrapServiceImpl.java | 25 +++++++++++++++++++
 .../st/instor/wql/QST_IVT_PRODUCTSCRAP.wql    | 12 +++++++++
 2 files changed, 37 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
index 171b7c366..1de86337c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/ProductScrapServiceImpl.java
@@ -479,6 +479,10 @@ public class ProductScrapServiceImpl implements ProductScrapService {
                 .addParam("flag", "3").addParam("stor_id", stor_id).addParam("in_stor_id",in_stor_id)
                 .process().getResultJSONArray(0).toJavaList(JSONObject.class);
 
+        // 查询不合格品来源字典
+        List<JSONObject> dictList = WQL.getWO("QST_IVT_PRODUCTSCRAP").addParam("flag", "3")
+                .process().getResultJSONArray(0).toJavaList(JSONObject.class);
+
         // 循环获取的数据
         ArrayList<JSONObject> resultList = new ArrayList<>();
         for (int i = 0; i < read.size(); i++) {
@@ -492,6 +496,10 @@ public class ProductScrapServiceImpl implements ProductScrapService {
             String box_no = list.get(2).toString();
             // 重量
             String qty = list.get(3).toString();*/
+            // 不合格品来源
+            String fail_source = list.get(4).toString();
+            // 不合格描述
+            String remark = list.get(5).toString();
 
             // 子卷号和批次号必须有一个不为空
             if (ObjectUtil.isEmpty(pcsn) && ObjectUtil.isEmpty(sap_pcsn)) {
@@ -513,6 +521,23 @@ public class ProductScrapServiceImpl implements ProductScrapService {
                         .filter(row -> row.getString("storagevehicle_code").equals(json.getString("storagevehicle_code")))
                         .collect(Collectors.toList());
 
+                // 匹配不合格品来源
+                String value = "";
+                List<JSONObject> label = dictList.stream()
+                        .filter(row -> row.getString("label").equals(fail_source))
+                        .collect(Collectors.toList());
+
+                if (ObjectUtil.isNotEmpty(label)) {
+                    value = label.get(0).getString("value");
+                }
+
+                // 插入不合格品来源、不合格品描述
+                String finalValue = value;
+                boxList.forEach(row -> {
+                    row.put("fail_source", finalValue);
+                    row.put("remark",remark);
+                });
+
                 resultList.addAll(boxList);
             }
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
index d3dcb1ca1..cae98e5cd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_PRODUCTSCRAP.wql
@@ -109,4 +109,16 @@
             order by dtl.seq_no
             ENDSELECT
         ENDQUERY
+    ENDIF
+
+	 IF 输入.flag = "3"
+        QUERY
+            SELECT
+                *
+            FROM
+            	sys_dict
+            WHERE
+            	code = 'FAIL_SOURCE'
+            ENDSELECT
+        ENDQUERY
     ENDIF
\ No newline at end of file