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

Merge remote-tracking branch 'origin/master'

Browse Source
master
夜笙歌 4 years ago
parent a649aa4574 10607f946a
commit b9b254fddd
7 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -47,7 +47,7 @@ public class AllBroadHTMLController {
public String finalAssemblyProduction() { public String finalAssemblyProduction() {
return "broad/finalAssemblyProductionData"; return "broad/finalAssemblyProductionData";
} }
//5 门体集存库位置
@GetMapping("/orderVisualization") @GetMapping("/orderVisualization")
public String orderVisualization() { public String orderVisualization() {
return "broad/orderVisualization"; return "broad/orderVisualization";

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

@ -35,15 +35,14 @@ public class FPBroadController {
@PostMapping("/selectOrderExecution") @PostMapping("/selectOrderExecution")
@ApiOperation("订单执行、生产统计") @ApiOperation("订单执行、生产统计")
private String selectOrderExecution() { private String selectOrderExecution() {
return JSONArray.toJSONString(service.fp_selectOrderExecution()); return JSONArray.toJSONString(service.fp_selectOrderExecution());
} }
@PostMapping("/selectOrderInfo") @PostMapping("/selectFpOrderInfo")
@ApiOperation("中间生产数量统计") @ApiOperation("中间生产数量统计")
private String selectProductionStatistics() { private String selectFpOrderInfo() {
return JSONObject.toJSONString(service.selectplanCompletion("1005")); return JSONObject.toJSONString(service.selectFpOrderInfo());
} }
@PostMapping("/selectDeviceStation") @PostMapping("/selectDeviceStation")
@ -73,11 +72,14 @@ public class FPBroadController {
Set<String> strings = map.keySet(); Set<String> strings = map.keySet();
Map<String,String> stateMap=new HashMap<>();
for (String key:strings) { for (String key:strings) {
Process p = null; Process p = null;
try { try {
p = Runtime.getRuntime().exec("/system/bin/ping -c 1 " + map.get(key)); p = Runtime.getRuntime().exec("/system/bin/ping -c 1 10.10.60.176");
int status = p.waitFor(); int status = p.waitFor();
System.out.println(status); System.out.println(status);
@ -95,5 +97,11 @@ public class FPBroadController {
} }
@PostMapping("/selectFpStock")
@ApiOperation("发泡库存统计")
public String selectFpStock(){
return JSONArray.toJSONString(service.selectFpStock());
}
} }

2
ruoyi-admin/src/main/resources/templates/broad/box.html
Unescape Escape View File

@ -299,7 +299,7 @@
.display-blocks span:last-child { .display-blocks span:last-child {
margin-right: 0; margin-right: 0;
} }
</style> </style>
</head> </head>
<body class="UShellMetalPlateScada" style="display:flex;"> <body class="UShellMetalPlateScada" style="display:flex;">
<script src="../../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script> <script src="../../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>

4
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java
Unescape Escape View File

@ -44,6 +44,10 @@ public interface BroadDataMapper {
List<OrderInfo> xk_selectStockOccupancy(); List<OrderInfo> xk_selectStockOccupancy();
List<BoxOutput> selectFpStock();
BoxPlanCompletion selectFpOrderInfo();
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// 6 // 6

4
ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java
Unescape Escape View File

@ -43,4 +43,8 @@ public interface IBroadDataService {
List<FPStationHourInfo> fp_selectStationHourInfo(); List<FPStationHourInfo> fp_selectStationHourInfo();
List<OrderInfo> xk_selectStockOccupancy(); List<OrderInfo> xk_selectStockOccupancy();
List<BoxOutput> selectFpStock();
BoxPlanCompletion selectFpOrderInfo();
} }

10
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java
Unescape Escape View File

@ -70,6 +70,16 @@ public class BroadDataServiceImpl implements IBroadDataService
public List<FPStationHourInfo> fp_selectStationHourInfo() { public List<FPStationHourInfo> fp_selectStationHourInfo() {
return mapper.fp_selectStationHourInfo(); return mapper.fp_selectStationHourInfo();
} }
@Override
public List<BoxOutput> selectFpStock() {
return mapper.selectFpStock();
}
@Override
public BoxPlanCompletion selectFpOrderInfo() {
return mapper.selectFpOrderInfo();
}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// 泡前库 // 泡前库
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

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

@ -181,6 +181,33 @@
<select id="fp_selectOrderExecution" resultType="com.ruoyi.system.domain.OrderInfo"> <select id="fp_selectOrderExecution" resultType="com.ruoyi.system.domain.OrderInfo">
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
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,
sum(PRODUCT_QTY) as actual_number
from IMOS_PR_FOAMING_MONITOR
group by MATERIAL_NAME
</select>
<select id="selectFpOrderInfo" resultType="com.ruoyi.system.domain.BoxPlanCompletion">
select sum(PLAN_QTY) qty, '当班计划' as name
from imos_ta_material
where DISPLAY_FLAG = 1
union
select sum(PRODUCT_QTY) qty, '实际产量' as name
from IMOS_PR_FOAMING_MONITOR
</select>
<select id="selectFpStock" resultType="com.ruoyi.system.domain.BoxOutput">
select substr(MATERIAL_NAME, select substr(MATERIAL_NAME,
case case
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1 when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
@ -195,15 +222,12 @@
when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1 when instr(MATERIAL_NAME, '/', 1, 1) = 0 then instr(MATERIAL_NAME, ',', 1, 1) + 1
else instr(MATERIAL_NAME, '/', 1, 1) + 1 else instr(MATERIAL_NAME, '/', 1, 1) + 1
end) as name, end) as name,
sum(PLAN_QTY) as plan_number, STORE_QTY as qty
SUM(ACTUAL_QTY) as qty from IMOS_LO_BIN
from IMOS_PR_PLAN where MATERIAL_NAME like '发泡箱体%'
where to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') and STORE_QTY > 0
and PROCESS_CODE = '1005' and delete_flag = '0'
group by MATERIAL_NAME
</select> </select>
<select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput"> <select id="pqk_selectProductInStore" resultType="com.ruoyi.system.domain.BoxOutput">
select substr(MATERIAL_NAME, select substr(MATERIAL_NAME,
case case
@ -329,7 +353,7 @@
</select> </select>
<select id="" resultType="com.ruoyi.system.domain.BoxOutput"> <select id="QQ" resultType="com.ruoyi.system.domain.BoxOutput">
insert into temp1 ( insert into temp1 (
select row_number() over (order by CREATION_DATE) as row_number, select row_number() over (order by CREATION_DATE) as row_number,
CREATION_DATE as day CREATION_DATE as day

Write Preview
Loading…
Cancel
Save