wangh
/
aucma-benchmarking-factory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 展示看板class

Browse Source
master
wangh 4 years ago
parent 48ea19bc76
commit 859b7d5614
8 changed files with 77 additions and 80 deletions
Show Stats Download Patch File Download Diff File

34
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/IntelligentRefrigeratorInterconnectionFactoryController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java
Unescape Escape View File

@ -19,17 +19,33 @@ import java.util.List;
*
*/
@Controller
@RequestMapping("/broad/intelligentRefrigeratorInterconnectionFactory")
@ApiOperation("泡前库")
public class IntelligentRefrigeratorInterconnectionFactoryController {
@Autowired
private IBroadDataService service;
@GetMapping()
public String box() {
@RequestMapping("/broad")
public class AllBroadHTMLController {
//1 建模
@GetMapping("/factory")
public String factory() {
return "broad/intelligentRefrigeratorInterconnectionFactory";
}
//2箱壳
@GetMapping("/box")
public String box() {
return "broad/box";
}
//3 发泡
@GetMapping("/fp")
public String getBroad() {
return "broad/fp";
}
//4 泡前库
@GetMapping("/beforeLibrary")
public String beforeLibrary() {
return "broad/beforeLibrary";
}
@GetMapping("/finalAssemblyProductionData")
public String finalAssemblyProduction() {
return "broad/finalAssemblyProductionData";
}
}

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BeforeLibraryController.java
Unescape Escape View File

@ -27,10 +27,7 @@ public class BeforeLibraryController {
@Autowired
private IBroadDataService service;
@GetMapping()
public String box() {
return "broad/beforeLibrary";
}
@PostMapping("/selectProductInStore")
@ApiOperation("泡前库 成品入库")

17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java
Unescape Escape View File

@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
@ -19,18 +18,12 @@ import java.util.List;
*/
@Controller
@RequestMapping("/broad/box")
@ResponseBody
public class BoxBroadController {
@Autowired
private IBroadDataService service;
@GetMapping()
public String box() {
return "broad/box";
}
@PostMapping("/planCompletion")
@ResponseBody
@ApiOperation("箱壳查询计划数量完成情况")
public String selectplanCompletion() {
BoxPlanCompletion completion = service.selectplanCompletion("1002");
@ -39,10 +32,8 @@ public class BoxBroadController {
// 库存
@PostMapping("/selectStock/{id}")
@ResponseBody
@ApiOperation("箱壳查询库存")
public String selectStock(@PathVariable("id") String id) {
List<Long> seriesInfo = new ArrayList<Long>();
List<String> xAxisInfo = new ArrayList<String>();
List<BoxStock> list = service.selectStock(id);
@ -54,10 +45,8 @@ public class BoxBroadController {
return JSONObject.toJSONString(new EchartsDTO(xAxisInfo, seriesInfo));
}
private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@PostMapping("/selectOutputByType")
@ResponseBody
@ApiOperation("箱壳按类型查询产量")
public String selectOutputByType() {
List<BoxOutput> info = service.selectOutputByType();
@ -67,7 +56,6 @@ public class BoxBroadController {
}
@PostMapping("/selectOutputByTime")
@ResponseBody
@ApiOperation("箱壳按小时查询产量")
public String selectOutputByTime() {
List<BoxOutput> info = service.selectOutputByTime();
@ -78,7 +66,6 @@ public class BoxBroadController {
@PostMapping("/getProductPlanInfo")
@ResponseBody
public String getProductPlanInfo() {
List<OrderInfo> planInfo = service.getUHullPlanInfo("1002");
String jsonInfo = JSONArray.toJSONString(planInfo);

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FPBroadController.java
Unescape Escape View File

@ -26,10 +26,7 @@ public class FPBroadController {
@Autowired
IBroadDataService service;
@GetMapping()
private String getBroad() {
return "/broad/fp";
}
@PostMapping("/selectOrderExecution")
@ApiOperation("订单执行、生产统计")

25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/FinalAssemblyProductionDataController.java
Unescape Escape View File

@ -1,25 +0,0 @@
package com.ruoyi.web.controller.broad;
import com.ruoyi.system.service.IBroadDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @author wanghao
* @date 2022/7/7 13:31
*/
@Controller
@RequestMapping("/broad/finalAssemblyProductionData")
public class FinalAssemblyProductionDataController {
@Autowired
private IBroadDataService service;
@GetMapping()
public String box() {
return "broad/finalAssemblyProductionData";
}
}

2
ruoyi-admin/src/main/resources/application.yml
Unescape Escape View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为80
port: 8080
port: 9090
servlet:
# 应用的访问路径
context-path: /

10
ruoyi-system/src/main/java/com/ruoyi/system/domain/FPStationHourInfo.java
Unescape Escape View File

@ -5,7 +5,7 @@ package com.ruoyi.system.domain;
* @date 2022/7/14 16:06
*/
public class FPStationHourInfo {
private String name, STATION_NO, plan_number, qty, rate, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11, h12;
private String name, station_no, plan_number, qty, rate, h1, h2, h3, h4, h5, h6, h7, h8, h9, h10, h11, h12;
public String getName() {
return name;
@ -15,12 +15,12 @@ public class FPStationHourInfo {
this.name = name;
}
public String getSTATION_NO() {
return STATION_NO;
public String getStation_no() {
return station_no;
}
public void setSTATION_NO(String STATION_NO) {
this.STATION_NO = STATION_NO;
public void setStation_no(String station_no) {
this.station_no = station_no;
}
public String getPlan_number() {

59
ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml
Unescape Escape View File

@ -24,8 +24,7 @@
</select>
<select id="selectStock" resultType="com.ruoyi.system.domain.BoxStock">
select material_name
, substr(MATERIAL_NAME,
select substr(MATERIAL_NAME,
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
@ -72,16 +71,30 @@
</select>
<select id="getUHullPlanInfo" resultType="com.ruoyi.system.domain.OrderInfo">
select PLAN_NO as plan_code,
SUM(PLAN_QTY) as plan_number,
SUM(ACTUAL_QTY) as actual_number,
to_char(sysdate , 'yyyy-MM-dd') as day
select PLAN_NO as plan_code,
substr(MATERIAL_NAME,
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
end,
case
when instr(MATERIAL_NAME, ',', 1, 2) = 0 then Length(MATERIAL_NAME) + 1
else instr(MATERIAL_NAME, ',', 1, 2)
end
-
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
end) as name,
PLAN_QTY as plan_number,
ACTUAL_QTY as actual_number,
round(ACTUAL_QTY / PLAN_QTY * 100,2) as rate,
START_TIME
from IMOS_PR_PLAN t
where process_code = #{id}
where process_code = 1002
and delete_flag = '0'
and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
group by PLAN_NO
order by PLAN_NO desc
order by START_TIME desc
</select>
<select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
@ -119,7 +132,17 @@
<select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">
select MATERIAL_NAME as name ,
select substr(MATERIAL_NAME,
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
end,
instr(MATERIAL_NAME, ',', 1, 1)
-
case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
end) as name,
IN_QTY as qty
from IMOS_PR_PRODUCT_IN
where TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
@ -161,8 +184,8 @@
QUALITY_DEFECTS_DESC as name
from IMOS_QA_PRODUCT_QUALITY
where ITEM_CODE in (1006, 1001)
-- 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')
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
</select>
@ -176,7 +199,8 @@
from IMOS_QA_PRODUCT_QUALITY record
left join IMOS_QA_QUALITY_ITEM base on record.ITEM_CODE = base.ITEM_CODE
where record.ITEM_CODE in (1006, 1001)
and to_char(record.CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate-1,'yyyy-mm-dd') and to_char(sysdate+1,'yyyy-mm-dd')
and to_char(record.CREATION_DATE, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd')
-- and to_char(record.CREATION_DATE, 'yyyy-MM-dd') between to_char(sysdate-1,'yyyy-mm-dd') and to_char(sysdate+1,'yyyy-mm-dd')
order by record.CREATION_DATE desc
</select>
@ -187,7 +211,8 @@
nvl(FOAMING_PARA_POLTEMPERATURE, '0') as pol_wd,
nvl(FOAMING_PARA_SOTEMPERATURE, '0') as so_wd
from IMOS_PR_FOAMING_STATION
order by to_number(STATION_NO);
where FOAMING_PARA_POLPRESSURE is not null
order by to_number(STATION_NO)
</select>
@ -206,10 +231,10 @@
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1
end) as name,
STATION_NO,
STATION_NO ,
CURRENTPLAN_QTY as plan_number,
PRODUCT_QTY as qty,
round(PRODUCT_QTY / CURRENTPLAN_QTY * 100, 2)||'%' as rate,
round(PRODUCT_QTY / CURRENTPLAN_QTY * 100, 2) as rate,
HOUR_QTY1 as h1,
HOUR_QTY2 as h2,
HOUR_QTY3 as h3,
@ -223,6 +248,6 @@
HOUR_QTY11 h11,
HOUR_QTY12 h12
from IMOS_PR_FOAMING_MONITOR
order by to_number(STATION_NO);
order by to_number(STATION_NO)
</select>
</mapper>
Write Preview
Loading…
Cancel
Save