From e3a5edc0b5a9d9c31e55864c9369cdeb3bcb2577 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 22 Jul 2022 11:18:52 +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 | 20 ++++++++++++++++--- .../com/ruoyi/system/domain/BoxOutput.java | 9 +++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 2 ++ .../system/service/IBroadDataService.java | 2 ++ .../service/impl/BroadDataServiceImpl.java | 2 ++ .../service/impl/BroadDruidServiceImpl.java | 2 +- .../mapper/system/BroadDataMapper.xml | 5 +++-- 7 files changed, 36 insertions(+), 6 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 058dc85..4d5eafe 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 @@ -68,16 +68,30 @@ public class BoxBroadController { @ApiOperation("箱壳按小时查询产量") public String selectOutputByTime() { List info = service.selectOutputByTime(); - int qty = BroadDruidServiceImpl.selectNowXkOutPut(); + BoxOutput boxOutput= info.get(0); + info.remove(0); + int qty = BroadDruidServiceImpl.selectNowXkOutPut();//实时的数量 + if (info.isEmpty()){//只有7.30 + boxOutput.setName("7:30"); + boxOutput.setQty(qty); + }else { + BoxOutput boxOutputSize = info.get(info.size() - 1); + String hName=boxOutputSize.getName(); + String newName=hName.substring(0,hName.indexOf(":")); + BoxOutput boxOutputNow=new BoxOutput(); - BoxOutput boxOutput=info.get(info.size()-1); - boxOutput.setQty(qty+boxOutput.getQty()); + boxOutputNow.setName((Integer.parseInt(newName)+1)+":30"); + boxOutputNow.setQty(qty-boxOutputSize.getRecord_qty()); + info.add(boxOutputNow); + } String jsonInfo = JSONArray.toJSONString(info); System.out.println("根据型号统计产量：" + jsonInfo); return jsonInfo; } + + @PostMapping("/getProductPlanInfo") @ApiOperation("箱壳工单详情") public String getProductPlanInfo() { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java index f5f49c2..26125d7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutput.java @@ -7,6 +7,7 @@ package com.ruoyi.system.domain; public class BoxOutput { private String name; private int qty; + private int record_qty; private double rate; public String getName() { @@ -32,4 +33,12 @@ public class BoxOutput { public void setRate(double rate) { this.rate = rate; } + + public int getRecord_qty() { + return record_qty; + } + + public void setRecord_qty(int record_qty) { + this.record_qty = record_qty; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 1ab58fe..d0b87d0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -76,4 +76,6 @@ public interface BroadDataMapper { List selectOneBadRateByDay(); BoxOutput selectOutputByTimeDY(); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index 09953fe..71c19aa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -60,4 +60,6 @@ public interface IBroadDataService { List selectOneBadRateByDay(); BoxOutput selectOutputByTimeDY(); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 67d7a0e..a572d92 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -38,6 +38,8 @@ public class BroadDataServiceImpl implements IBroadDataService return mapper.selectOutputByType(); } + + @Override public List getUHullPlanInfo(String id) { return mapper.getUHullPlanInfo(id); 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 52d101b..81c04aa 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 @@ -25,7 +25,7 @@ public class BroadDruidServiceImpl implements IBroadDruidService { int qty=mapper.selectXK_H_QTY(); //上一条 int zsQty=mapper.selectNowXkOutPut1(); int cha=nowOut-qty; - mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,zsQty); + mapper.insertXK_H_QTY(boxOutput.getName(),zsQty,cha<0?0:cha,nowOut); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 094b2f4..a1464c7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -148,8 +148,9 @@ where ROWNUM = 1) group by TO_CHAR(CREATION_DATE, 'hh24') + - select (TO_CHAR(SYSDATE, 'hh24') || ':30') as name, + select (TO_CHAR(SYSDATE, 'hh24')-1 || ':30') as name, 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