From c507d90916c49adf6630446e5487313b3a8fff61 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 7 Sep 2022 09:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=91=A8=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/system/BroadDataMapper.xml    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 325eb04..2b649c5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -569,7 +569,7 @@ where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
 
 
     <select id="zhou_selectProductInStore" resultMap="MTKBeen">
-        select to_char(DAY, 'MM-dd') as code, qty, '计划' as name
+        select to_char(DAY, 'MM-dd') as code, qty+QTY_B as qty, '计划' as name
         from haiwei.BASE_PRODUCT_QTY
         where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
         union
@@ -698,12 +698,12 @@ where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
                       length(MATERIAL_NAME))          as name,
                ORDER_QTY                              as plan_number,
                ACTUAL_QTY                             as actual_number,
-        substr(MATERIAL_NAME,
-        instr(MATERIAL_NAME, '-', 1, 1) + 1,
-        case
-        when instr(MATERIAL_NAME, ',', 1, 1) &lt; 6 then instr(MATERIAL_NAME, ',', 1, 2)
-        else instr(MATERIAL_NAME, ',', 1, 1) end-1 - instr(MATERIAL_NAME, '-', 1))
-        as name_sub,
+          substr(MATERIAL_NAME,
+              instr(MATERIAL_NAME, '-', 1, 1) + 1,
+              case
+                  when instr(MATERIAL_NAME, ',', 1, 2) =0  then instr(MATERIAL_NAME, ',', 1, 1)
+                  else instr(MATERIAL_NAME, ',', 1, 2) end - instr(MATERIAL_NAME, '-', 1, 1) -1
+           )                                  as name_sub,
                FINISH_DATE                            as day,
                round(ACTUAL_QTY / ORDER_QTY * 100, 2) as rate
         from IMOS_PR_ORDER