From 250881c4d99ef1f7c8ef5fbb8462c64232d9af11 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Thu, 7 Jul 2022 19:08:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=8C=89=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E4=BA=A7=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/broad/BoxBroadController.java | 12 ++++++++- .../ruoyi/system/domain/BoxOutputByType.java | 26 +++++++++++++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 3 +++ .../system/service/IBroadDataService.java | 3 +++ .../service/impl/BroadDataServiceImpl.java | 6 +++++ .../mapper/system/BroadDataMapper.xml | 12 +++++++++ 6 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutputByType.java 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 3296dc9..2fe240c 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 @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.broad; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONPObject; +import com.ruoyi.system.domain.BoxOutputByType; import com.ruoyi.system.domain.BoxPlanCompletion; import com.ruoyi.system.service.IBroadDataService; import io.swagger.annotations.Api; @@ -41,9 +42,18 @@ public class BoxBroadController { return JSONObject.toJSONString(completion); } // 库存 - @GetMapping("/selectStock") + @PostMapping("/selectStock") public String selectStock(){ return JSONObject.toJSONString(service.selectStock()); } +// 按类型查询产量 + @PostMapping("/selectOutputByType") + public String selectOutputByType(){ + List boxOutputByType=service.selectOutputByType(); + return JSONArray.toJSONString(boxOutputByType); + } + + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutputByType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutputByType.java new file mode 100644 index 0000000..bbc605c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BoxOutputByType.java @@ -0,0 +1,26 @@ +package com.ruoyi.system.domain; + +/** + * @author wanghao + * @date 2022/7/7 19:03 + */ +public class BoxOutputByType { + private String plan_type; + private int actual_production; + + public String getPlan_type() { + return plan_type; + } + + public void setPlan_type(String plan_type) { + this.plan_type = plan_type; + } + + public int getActual_production() { + return actual_production; + } + + public void setActual_production(int actual_production) { + this.actual_production = actual_production; + } +} 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 1da89c7..6259dfe 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 @@ -2,11 +2,13 @@ package com.ruoyi.system.mapper; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.enums.DataSourceType; +import com.ruoyi.system.domain.BoxOutputByType; import com.ruoyi.system.domain.BoxPlanCompletion; import com.ruoyi.system.domain.BoxStock; import org.springframework.stereotype.Repository; import javax.swing.*; +import java.util.List; /** * @author wanghao @@ -16,4 +18,5 @@ import javax.swing.*; public interface BroadDataMapper { BoxPlanCompletion selectplanCompletion(); BoxStock selectStock(); + List selectOutputByType(); } 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 cadd25d..7d0217a 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 @@ -1,5 +1,6 @@ package com.ruoyi.system.service; +import com.ruoyi.system.domain.BoxOutputByType; import com.ruoyi.system.domain.BoxPlanCompletion; import com.ruoyi.system.domain.BoxStock; import com.ruoyi.system.domain.SysOperLog; @@ -16,4 +17,6 @@ public interface IBroadDataService { BoxPlanCompletion selectplanCompletion(); BoxStock selectStock(); + + List selectOutputByType(); } 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 1a613f8..98097f6 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 @@ -8,6 +8,7 @@ import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.CacheUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.BoxOutputByType; import com.ruoyi.system.domain.BoxPlanCompletion; import com.ruoyi.system.domain.BoxStock; import com.ruoyi.system.domain.SysConfig; @@ -43,4 +44,9 @@ public class BroadDataServiceImpl implements IBroadDataService public BoxStock selectStock() { return mapper.selectStock(); } + + @Override + public List selectOutputByType() { + return mapper.selectOutputByType(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index e588d51..1d1559c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -40,4 +40,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group by material_name, ls.STORE_DESC order by material_name + + \ No newline at end of file