From 465ed137e3ab29b00ff2baedb2adcab6f1a5c7dd Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 16 Jan 2025 10:24:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20B2=E7=83=98=E7=83=A4=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=82=B9=E4=BD=8D=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mps/service/impl/BakingServiceImpl.java   |  2 +-
 .../wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql   | 99 +++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
index 50780f10f..80004c0a8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
@@ -256,7 +256,7 @@ public class BakingServiceImpl implements BakingService {
                 JSONObject map = new JSONObject();
                 map.put("flag", "1");
                 if (product_area.equals("B2")) {
-                    map.put("flag", "3");
+                    map.put("flag", "302");
                 }
                 map.put("reging_id", reging_id);
                 map.put("point_location", point_location);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
index 32181fc70..e3531b8b9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
@@ -294,6 +294,105 @@
     		ENDQUERY
     	ENDIF
 
+    	IF 输入.flag = "302"
+            QUERY
+                SELECT
+                    a.*,
+                    b.num
+                FROM
+                    sch_base_point a
+                    INNER JOIN (
+                    SELECT
+                        COUNT( c.task_id ) AS num,
+                        c.point_code
+                    FROM
+                        (
+                        SELECT
+                            task.task_id,
+                            point_code
+                        FROM
+                            SCH_BASE_Point po
+                            LEFT JOIN sch_base_task task ON task.point_code1 = po.point_code
+                            AND task.task_status < '07'
+                            AND task.is_delete = '0'
+                        WHERE
+                            po.is_delete = '0'
+                            AND po.is_used = '1'
+                            OPTION 输入.reging_id <> ""
+                            po.region_id = 输入.reging_id
+                        ENDOPTION
+
+                        OPTION 输入.cant_location <> ""
+                            po.point_location not in 输入.cant_location
+                        ENDOPTION
+
+                        OPTION 输入.point_type <> ""
+                            po.point_type = 输入.point_type
+                        ENDOPTION
+                        OPTION 输入.point_type = "5"
+                            IFNULL(po.material_code,'') = ''
+                        ENDOPTION
+                        UNION
+                        SELECT
+                            task.task_id,
+                            point_code
+                        FROM
+                            SCH_BASE_Point po
+                            LEFT JOIN sch_base_task task ON task.point_code2 = po.point_code
+                            AND task.task_status < '07'
+                            AND task.is_delete = '0'
+                        WHERE
+                            po.is_delete = '0'
+                            AND po.is_used = '1'
+                            OPTION 输入.reging_id <> ""
+                                        po.region_id = 输入.reging_id
+                                    ENDOPTION
+
+                                    OPTION 输入.cant_location <> ""
+                                        po.point_location not in 输入.cant_location
+                                    ENDOPTION
+
+                                    OPTION 输入.point_type <> ""
+                                        po.point_type = 输入.point_type
+                                    ENDOPTION
+                                    OPTION 输入.point_type = "5"
+                                        IFNULL(po.material_code,'') = ''
+                                    ENDOPTION
+                                     UNION
+                        SELECT
+                            task.task_id,
+                            point_code
+                        FROM
+                            SCH_BASE_Point po
+                            LEFT JOIN sch_base_task task ON task.point_code3 = po.point_code
+                            AND task.task_status < '07'
+                            AND task.is_delete = '0'
+                        WHERE
+                            po.is_delete = '0'
+                            AND po.is_used = '1'
+                            OPTION 输入.reging_id <> ""
+                                        po.region_id = 输入.reging_id
+                                    ENDOPTION
+
+                                    OPTION 输入.cant_location <> ""
+                                        po.point_location not in 输入.cant_location
+                                    ENDOPTION
+
+                                    OPTION 输入.point_type <> ""
+                                        po.point_type = 输入.point_type
+                                    ENDOPTION
+                                    OPTION 输入.point_type = "5"
+                                        IFNULL(po.material_code,'') = ''
+                                    ENDOPTION
+                        ) c
+                    GROUP BY
+                        c.point_code
+                ) b ON b.point_code = a.point_code AND a.point_status = '1'
+                ORDER BY num,a.point_code
+                ENDSELECT
+            ENDQUERY
+        ENDIF
+
     	IF 输入.flag = "4"
             QUERY
                 SELECT