From eee02c053f77599095c97edf5409abac41778546 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 14 Jul 2022 09:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=B3=A1=E5=89=8D?= =?UTF-8?q?=E5=BA=93=20pqk=20=E8=B4=A8=E9=87=8F=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../broad/BeforeLibraryController.java | 40 ++++++++++- .../resources/static/css/autoscroll-table.css | 2 +- .../com/ruoyi/system/domain/QualityInfo.java | 53 +++++++++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 9 +-- .../system/service/IBroadDataService.java | 3 + .../service/impl/BroadDataServiceImpl.java | 10 +++ .../mapper/system/BroadDataMapper.xml | 66 ++++++++++++------- 7 files changed, 154 insertions(+), 29 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.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 78ceb61..121b858 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 @@ -3,8 +3,11 @@ package com.ruoyi.web.controller.broad; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.system.domain.BoxOutput; +import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.QualityInfo; import com.ruoyi.system.service.IBroadDataService; import io.swagger.annotations.ApiOperation; +import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -14,11 +17,11 @@ import java.util.ArrayList; import java.util.List; /** - * @author wanghao - * @date 2022/7/7 13:31 + * */ @Controller @RequestMapping("/broad/beforeLibrary") +@ApiOperation("泡前库") public class BeforeLibraryController { @Autowired @@ -29,4 +32,37 @@ public class BeforeLibraryController { return "broad/beforeLibrary"; } + @PostMapping("/selectProductInStore") + @ApiOperation("泡前库 成品入库") + @ResponseBody + public String pqk_selectProductInStore() { + List list = service.pqk_selectProductInStore(); + return JSONArray.toJSONString(list); + } + + @PostMapping("/selectOrderInfo") + @ApiOperation("泡前库 订单情况、完成率") + @ResponseBody + public String pqk_selectOrderInfo() { + List list = service.pqk_selectOrderInfo(); + return JSONArray.toJSONString(list); + } + + @PostMapping("/selectQualityItem") + @ApiOperation("泡前库-成品质量类型统计") + @ResponseBody + public String pqk_selectQualityItem(){ + return JSONArray.toJSONString(service.pqk_selectQualityItem()); + } + + @PostMapping("/selectQualityInfo") + @ApiOperation("泡前库-成品质检详情") + @ResponseBody + public String pqk_selectQualityInfo(){ + List list=service.pqk_selectQualityInfo(); + return JSONArray.toJSONString(list); + } + + + } diff --git a/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css b/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css index 16c840d..d8194b1 100644 --- a/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css +++ b/ruoyi-admin/src/main/resources/static/css/autoscroll-table.css @@ -94,7 +94,7 @@ } .autoscroll-table td { - font-size: 11%; + font-size: 0.75vw; } .autoscroll-table caption { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java new file mode 100644 index 0000000..57b8abd --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java @@ -0,0 +1,53 @@ +package com.ruoyi.system.domain; + +/** + * @author wanghao + * @date 2022/7/14 9:30 + */ +public class QualityInfo { + private String code; + private String qa; + private String item; + private String day; + private String state; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getQa() { + return qa; + } + + public void setQa(String qa) { + this.qa = qa; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getDay() { + return day; + } + + public void setDay(String day) { + this.day = day; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } +} 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 d3c45ec..2777057 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 @@ -1,9 +1,6 @@ package com.ruoyi.system.mapper; -import com.ruoyi.system.domain.BoxOutput; -import com.ruoyi.system.domain.BoxPlanCompletion; -import com.ruoyi.system.domain.BoxStock; -import com.ruoyi.system.domain.OrderInfo; +import com.ruoyi.system.domain.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -37,4 +34,8 @@ public interface BroadDataMapper { List pqk_selectProductInStore(); List pqk_selectOrderInfo(); + + List pqk_selectQualityItem(); + + List pqk_selectQualityInfo(); } 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 f94e97b..8b083d3 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 @@ -33,4 +33,7 @@ public interface IBroadDataService { List pqk_selectOrderInfo(); + List pqk_selectQualityItem(); + + 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 911b13d..1e1a508 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 @@ -74,4 +74,14 @@ public class BroadDataServiceImpl implements IBroadDataService public List pqk_selectOrderInfo() { return mapper.pqk_selectOrderInfo(); } + + @Override + public List pqk_selectQualityItem() { + return mapper.pqk_selectQualityItem(); + } + + @Override + public List pqk_selectQualityInfo() { + return mapper.pqk_selectQualityInfo(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 18ae98a..b55483d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -1,16 +1,16 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - + + + - + - + - select PLAN_NO as plan_code, SUM(PLAN_QTY) as plan_number, SUM(ACTUAL_QTY) as actual_number, @@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select substr(MATERIAL_NAME, case when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1 @@ -121,8 +121,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + + + \ No newline at end of file