From 9141703d59e6b9fd44361659ba08126cc9658a01 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Tue, 26 Jul 2022 11:40:06 +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 --- .../broad/BeforeLibraryController.java | 29 +++++---- .../web/controller/broad/ZhouController.java | 45 +++++++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 10 ++- .../system/service/IBroadDataService.java | 6 +- .../service/impl/BroadDataServiceImpl.java | 16 +++-- .../mapper/system/BaseProductQtyMapper.xml | 2 +- .../mapper/system/BroadDataMapper.xml | 63 ++++++++++--------- 7 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZhouController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java index 9b6f5f2..0ceeab0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java @@ -29,13 +29,6 @@ public class BeforeLibraryController { -// @PostMapping("/selectProductInStore") -// @ApiOperation("泡前库 成品入库") -// @ResponseBody -// public String pqk_selectProductInStore() { -// List list = service.pqk_selectProductInStore(); -// return JSONArray.toJSONString(list); -// } @PostMapping("/selectOrderInfo") @ApiOperation("泡前库 订单情况、完成率") @@ -45,12 +38,7 @@ public class BeforeLibraryController { return JSONArray.toJSONString(list); } -// @PostMapping("/selectQualityItem") -// @ApiOperation("泡前库-质量统计") -// @ResponseBody -// public String pqk_selectQualityItem(){ -// return JSONArray.toJSONString(service.pqk_selectQualityItem()); -// } + @PostMapping("/selectQualityInfo") @ApiOperation("泡前库-成品质检详情") @@ -60,6 +48,21 @@ public class BeforeLibraryController { return JSONArray.toJSONString(list); } +// @PostMapping("/selectProductInStore") +// @ApiOperation("泡前库 成品入库") +// @ResponseBody +// public String pqk_selectProductInStore() { +// List list = service.pqk_selectProductInStore(); +// return JSONArray.toJSONString(list); +// } + + + // @PostMapping("/selectQualityItem") +// @ApiOperation("泡前库-质量统计") +// @ResponseBody +// public String pqk_selectQualityItem(){ +// return JSONArray.toJSONString(service.pqk_selectQualityItem()); +// } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZhouController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZhouController.java new file mode 100644 index 0000000..886ca0d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZhouController.java @@ -0,0 +1,45 @@ +package com.ruoyi.web.controller.broad; + +import com.alibaba.fastjson.JSONArray; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.QualityInfo; +import com.ruoyi.system.service.IBroadDataService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * + */ +@Controller +@RequestMapping("/broad/zhou") +@ApiOperation("周看板98寸") +public class ZhouController { + + @Autowired + private IBroadDataService service; + + @PostMapping("/selectProductInStore") + @ApiOperation("周产量统计") + @ResponseBody + public String zhou_selectProductInStore() { + +// IMOS_PR_PRODUCT_BARCODE + return JSONArray.toJSONString( service.zhou_selectProductInStore()); + } + + + @PostMapping("/selectOrderRateInfo") + @ApiOperation("周订单执行情况") + @ResponseBody + public String zhou_selectOrderRateInfo() { + return JSONArray.toJSONString(service.zhou_selectOrderRateInfo()); + } + + +} 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 8f1b391..28acca4 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 @@ -32,12 +32,11 @@ public interface BroadDataMapper { // 泡前库 /////////////////////////////////////////////////////////////////////////// - // 成品入库 - List pqk_selectProductInStore(); + List pqk_selectOrderInfo(); - List pqk_selectQualityItem(); + List zhou_selectOrderRateInfo(); List pqk_selectQualityInfo(); @@ -96,4 +95,9 @@ public interface BroadDataMapper { List mtk_sselectQATop3(); List mtk_selectQAZD(); + + /////////////////////////////////////////////////////////////////////////// + // 周看板 + /////////////////////////////////////////////////////////////////////////// + List zhou_selectProductInStore(); } 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 c419032..5802c76 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 @@ -26,13 +26,13 @@ public interface IBroadDataService { - // 泡前库 成品入库 - List pqk_selectProductInStore(); + + List zhou_selectProductInStore(); //泡前库 订单完成率 List pqk_selectOrderInfo(); - List pqk_selectQualityItem(); + List zhou_selectOrderRateInfo(); List pqk_selectQualityInfo(); 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 9f203b6..aaf91f8 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 @@ -96,10 +96,6 @@ public class BroadDataServiceImpl implements IBroadDataService /////////////////////////////////////////////////////////////////////////// // 成品入库 - @Override - public List pqk_selectProductInStore(){ - return mapper.pqk_selectProductInStore(); - } @Override public List pqk_selectOrderInfo() { @@ -107,8 +103,8 @@ public class BroadDataServiceImpl implements IBroadDataService } @Override - public List pqk_selectQualityItem() { - return mapper.pqk_selectQualityItem(); + public List zhou_selectOrderRateInfo() { + return mapper.zhou_selectOrderRateInfo(); } @Override @@ -190,4 +186,12 @@ public class BroadDataServiceImpl implements IBroadDataService public BoxOutput zz_selectOneBadRateMb() { return mapper.zz_selectOneBadRateMb(); } + /////////////////////////////////////////////////////////////////////////// + // 周 + /////////////////////////////////////////////////////////////////////////// + @Override + public List zhou_selectProductInStore(){ + return mapper.zhou_selectProductInStore(); + } + } diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseProductQtyMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseProductQtyMapper.xml index 1e4d9c0..1f5e32c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BaseProductQtyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BaseProductQtyMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and day between #{params.beginDay} and #{params.endDay} - order by day + order by day desc - + select to_char(DAY, 'MM-dd') as code, qty, '目标' as name + from haiwei.BASE_PRODUCT_QTY + where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7) + union + select to_char(PRODUCTION_DATE, 'MM-dd') as code, count(1) as qty, '产量' as name + from IMOS.IMOS_PR_PRODUCT_BARCODE + where to_char(PRODUCTION_DATE, 'yyyy-MM-dd') in + ( + select to_char(DAY, 'yyyy-MM-dd') + from haiwei.BASE_PRODUCT_QTY + where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7) + ) + group by to_char(PRODUCTION_DATE, 'MM-dd') - select count(1) as qty, - QUALITY_DEFECTS_DESC as name - from IMOS_QA_PRODUCT_QUALITY - where ITEM_CODE in (1006, 1001) and ROWNUM <6 - and to_char(CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') --- and to_char(CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate - 1, 'yyyy-mm-dd') and to_char(sysdate + 1, 'yyyy-mm-dd') - group by QUALITY_DEFECTS_DESC - order by qty desc +