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 9b3a4b8..9b6f5f2 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,13 @@ public class BeforeLibraryController { - @PostMapping("/selectProductInStore") - @ApiOperation("泡前库 成品入库") - @ResponseBody - public String pqk_selectProductInStore() { - List list = service.pqk_selectProductInStore(); - return JSONArray.toJSONString(list); - } +// @PostMapping("/selectProductInStore") +// @ApiOperation("泡前库 成品入库") +// @ResponseBody +// public String pqk_selectProductInStore() { +// List list = service.pqk_selectProductInStore(); +// return JSONArray.toJSONString(list); +// } @PostMapping("/selectOrderInfo") @ApiOperation("泡前库 订单情况、完成率") @@ -45,12 +45,12 @@ public class BeforeLibraryController { return JSONArray.toJSONString(list); } - @PostMapping("/selectQualityItem") - @ApiOperation("泡前库-质量统计") - @ResponseBody - public String pqk_selectQualityItem(){ - return JSONArray.toJSONString(service.pqk_selectQualityItem()); - } +// @PostMapping("/selectQualityItem") +// @ApiOperation("泡前库-质量统计") +// @ResponseBody +// public String pqk_selectQualityItem(){ +// return JSONArray.toJSONString(service.pqk_selectQualityItem()); +// } @PostMapping("/selectQualityInfo") @ApiOperation("泡前库-成品质检详情") 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 index 57b8abd..b0e8360 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/QualityInfo.java @@ -5,26 +5,19 @@ package com.ruoyi.system.domain; * @date 2022/7/14 9:30 */ public class QualityInfo { - private String code; - private String qa; + + private String type; private String item; - private String day; - private String state; + private int qty; + private double rate; - public String getCode() { - return code; + + public String getType() { + return type; } - public void setCode(String code) { - this.code = code; - } - - public String getQa() { - return qa; - } - - public void setQa(String qa) { - this.qa = qa; + public void setType(String type) { + this.type = type; } public String getItem() { @@ -35,19 +28,19 @@ public class QualityInfo { this.item = item; } - public String getDay() { - return day; + public int getQty() { + return qty; } - public void setDay(String day) { - this.day = day; + public void setQty(int qty) { + this.qty = qty; } - public String getState() { - return state; + public double getRate() { + return rate; } - public void setState(String state) { - this.state = state; + public void setRate(double rate) { + this.rate = rate; } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index db3c4ab..1650de4 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -292,24 +292,24 @@ FROM (select PLAN_NUMBER