From f884b411077aceb349bf07741cbf750cade80ce0 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 22 Jul 2022 10:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/broad/BoxBroadController.java    |  9 +++++++--
 .../system/service/IBroadDruidService.java      |  2 ++
 .../service/impl/BroadDruidServiceImpl.java     | 10 ++++++++--
 .../resources/mapper/system/BroadDataMapper.xml | 17 +++++++++--------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
index 20714d1..058dc85 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.service.IBroadDataService;
+import com.ruoyi.system.service.IBroadDruidService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@ import java.util.List;
 public class BoxBroadController {
     @Autowired
     private IBroadDataService service;
+    @Autowired
+    private IBroadDruidService BroadDruidServiceImpl;
     
     @PostMapping("/planCompletion")
     @ApiOperation("箱壳查询计划数量完成情况")
@@ -65,8 +68,10 @@ public class BoxBroadController {
     @ApiOperation("箱壳按小时查询产量")
     public String selectOutputByTime() {
         List<BoxOutput> info = service.selectOutputByTime();
-        BoxOutput info1 = service.selectOutputByTimeDY();
-        info.add(info1);
+        int qty = BroadDruidServiceImpl.selectNowXkOutPut();
+
+        BoxOutput boxOutput=info.get(info.size()-1);
+        boxOutput.setQty(qty+boxOutput.getQty());
         String jsonInfo = JSONArray.toJSONString(info);
         System.out.println("根据型号统计产量：" + jsonInfo);
         return jsonInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java
index 589eb5a..83c0c39 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDruidService.java
@@ -13,4 +13,6 @@ public interface IBroadDruidService {
     int  selectTeamGroups();
 
     List<BoxOutput> zz_selectLossInfo();
+
+    int selectNowXkOutPut();
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java
index 814c273..52d101b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java
@@ -22,9 +22,15 @@ public class BroadDruidServiceImpl implements IBroadDruidService {
     public void createWork(){
         BoxOutput boxOutput=mapper.selectNowXkOutPut();
         int nowOut=boxOutput.getQty();
-        int qty=mapper.selectXK_H_QTY();
+        int qty=mapper.selectXK_H_QTY(); //上一条
         int zsQty=mapper.selectNowXkOutPut1();
-        mapper.insertXK_H_QTY(boxOutput.getName(),nowOut,nowOut-qty,zsQty);
+        int cha=nowOut-qty;
+        mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,zsQty);
+    }
+
+    @Override
+    public int selectNowXkOutPut() {
+        return mapper.selectNowXkOutPut1();
     }
 
     @Override
diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
index 625f5a9..094b2f4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
@@ -437,13 +437,14 @@
 
     <select id="selectNowXkOutPut" resultType="com.ruoyi.system.domain.BoxOutput">
         select (TO_CHAR(SYSDATE, 'hh24') || ':30') as name,
-               nvl(sum(actual_qty), 0) as qty
-        from IMOS.IMOS_PR_PLAN
-        where plan_date is not null
-          and process_code = 1002
-          and delete_flag = '0'
-          and (to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') or
-               to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate-1, 'yyyy-MM-dd'))
+        nvl(sum(actual_qty), 0)             as qty
+        from IMOS.IMOS_PR_PLAN xhq
+        left join (select * from haiwei.BASE_DAY_WBTIME where ROWNUM = 1 order by CREATE_TIME desc) wb on 1 = 1
+        where xhq.CREATION_DATE between case when sysdate &lt;= wb.W_END then W_START else W_END end
+        and case when sysdate &lt;= wb.W_END then W_END else B_END end
+        and plan_date is not null
+        and process_code = 1002
+        and delete_flag = '0'
     </select>
 
     <select id="selectNowXkOutPut1" resultType="int">
@@ -482,7 +483,7 @@
     </select>
 
     <select id="selectXK_H_QTY" resultType="int">
-              select * from (  select nvl(QTY, 0) from XK_H_QTY order by CREATE_TIME desc) where   ROWNUM=1
+       select * from (  select nvl(ZS_C, 0) from haiwei.XK_H_QTY order by CREATE_TIME desc) where   ROWNUM=1
     </select>
 
     <insert id="insertXK_H_QTY">