From 87861068bc40333a00cc38ae4fe9f36306b434e0 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Wed, 15 Feb 2023 15:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20loss=20=E5=88=86=E9=92=9F?=
 =?UTF-8?q?=E6=95=B0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/broad/ZZJXBroadController.java |  1 +
 .../mapper/system/BroadDataMapper.xml         | 97 ++++++++++---------
 2 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
index 77c1957..9c0dfd4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java
@@ -58,6 +58,7 @@ public class ZZJXBroadController {
     @PostMapping("/selectLossInfo")
     @ApiOperation("查询Loss和分布")
     private String selectLossInfo() {
+//        统计19.30之后还有没有入库的条码
         int tag = service.zz_countNightProductIn();
         if (tag > 0) {
             return JSONArray.toJSONString(service.zz_selectLossInfo(2));
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 50f0bc2..8c99066 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -1013,57 +1013,58 @@
     </insert>
 
     <select id="zz_selectLossInfo" resultType="com.ruoyi.system.domain.BoxOutput">
-        select ROUND(sum(ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM) / 60, 2) -
-               nvl(case
-                       when sysdate &gt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss')
-                           then
-                           case
-                               when sysdate &gt;
-                                    to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '14:30:00', 'yyyy-MM-dd hh24:mi:ss')
-                                   then 60
-                               else 30 end
-                       end
-                   , 0) as qty,
-               1        as name
+        select case when q1 &lt; q2 then q1 else q1 - 12 end as qty, name
+        from (
+        select ROUND(sum(ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM) / 60, 2) q1,
+        nvl(case
+        when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss')
+        then
+        case
+        when sysdate >
+        to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '14:30:00', 'yyyy-MM-dd hh24:mi:ss')
+        then 60
+        else 30 end
+        end
+        , 0) as                                                                      q2,
+        1        as                                                                      name
         from (select row_number() over (order by PRODUCTION_DATE) as row_number,
-             PRODUCTION_DATE                              as day
-              from IMOS.IMOS_PR_PRODUCT_BARCODE ippb
-                  left join (select *
-                  from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc)
-                  where ROWNUM = 1) wb
-              on 1 = 1
-              where ippb.PRODUCTION_DATE between
-                  case
-                  when #{state} = 1 then W_START
-                  when #{state} = 2 then W_END end
-                and
-                  case
-                  when #{state} = 1 then W_END
-                  when #{state} = 2 then B_END end
-                and DETIAL_TYPE_CODE = '1004') t1
-                 left join
-             (select row_number() over (order by PRODUCTION_DATE) as row_number,
-             PRODUCTION_DATE                              as day
-              from IMOS.IMOS_PR_PRODUCT_BARCODE ippb
-                  left join (select *
-                  from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc)
-                  where ROWNUM = 1) wb
-              on 1 = 1
-              where ippb.PRODUCTION_DATE between
-                  case
-                  when #{state} = 1 then W_START
-                  when #{state} = 2 then W_END end
-                and
-                  case
-                  when #{state} = 1 then W_END
-                  when #{state} = 2 then B_END end
-                and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1
-                 left join
-             (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1
+        PRODUCTION_DATE                              as day
+        from IMOS.IMOS_PR_PRODUCT_BARCODE ippb
+        left join (select *
+        from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc)
+        where ROWNUM = 1) wb
+        on 1 = 1
+        where ippb.PRODUCTION_DATE between
+        case
+        when 1 = 1 then W_START
+        when 1 = 2 then W_END end
+        and
+        case
+        when 1 = 1 then W_END
+        when 1 = 2 then B_END end
+        and DETIAL_TYPE_CODE = '1004') t1
+        left join
+        (select row_number() over (order by PRODUCTION_DATE) as row_number,
+        PRODUCTION_DATE                              as day
+        from IMOS.IMOS_PR_PRODUCT_BARCODE ippb
+        left join (select *
+        from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc)
+        where ROWNUM = 1) wb
+        on 1 = 1
+        where ippb.PRODUCTION_DATE between
+        case
+        when 1 = 1 then W_START
+        when 1 = 2 then W_END end
+        and
+        case
+        when 1 = 1 then W_END
+        when 1 = 2 then B_END end
+        and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1
+        left join
+        (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1
 
         where 0 &lt; ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM
-
-
+        )
         union
         select count(1) as qty,
                2        as name