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
夜笙歌 3 years ago
parent faffd91011 a64ddac31c
commit 84a3a45246
5 changed files with 172 additions and 20 deletions
Show Stats Download Patch File Download Diff File

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

@ -42,10 +42,19 @@ public class FPBroadController {
return JSONArray.toJSONString(service.fp_selectOrderExecution());
}
@PostMapping("/selectOrderExecutionPlan")
@PostMapping("/selectOrderExecutionDay")
@ApiOperation("底部列表白天使用")
private String selectOrderExecutionDay() {
return JSONArray.toJSONString(service.fp_selectOrderExecutionDay());
}
@PostMapping("/selectOrderExecutionPlan")
@ApiOperation("订单执行")
private String fp_selectOrderExecutionPlan() {
return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan());
return JSONArray.toJSONString(service.fp_selectOrderExecutionPlan());
}
@ -67,28 +76,30 @@ public class FPBroadController {
private String fp_selectStationHourInfo() {
return JSONArray.toJSONString(service.fp_selectStationHourInfo());
}
private Map<String,String> map;
private Map<String, String> map;
{
map=new HashMap<>();
map.put("A1","10.10.60.176");
map.put("A2","10.10.60.177");
map.put("B1","10.10.60.178");
map.put("B2","10.10.60.179");
map = new HashMap<>();
map.put("A1", "10.10.60.176");
map.put("A2", "10.10.60.177");
map.put("B1", "10.10.60.178");
map.put("B2", "10.10.60.179");
}
@PostMapping("/selectDeviceState")
@ApiOperation("设备状态查询")
private String selectDeviceState(){
private String selectDeviceState() {
Set<String> strings = map.keySet();
Map<String,Integer> stateMap = null;
Map<String, Integer> stateMap = null;
try {
stateMap =new HashMap<>();
stateMap = new HashMap<>();
for (String key:strings) {
ProcessBuilder procBuilder = new ProcessBuilder("ping", map.get(key),"-w","2","-n","1");
for (String key : strings) {
ProcessBuilder procBuilder = new ProcessBuilder("ping", map.get(key), "-w", "2", "-n", "1");
Process proc = procBuilder.start();
int exitValue = proc.waitFor();
stateMap.put(key,exitValue);
stateMap.put(key, exitValue);
}
} catch (IOException e) {
System.out.println(e.getMessage());
@ -96,24 +107,24 @@ public class FPBroadController {
} catch (InterruptedException e) {
e.printStackTrace();
}
String json=JSONArray.toJSONString(stateMap);
String json = JSONArray.toJSONString(stateMap);
return json;
}
@PostMapping("/selectFpStock")
@ApiOperation("发泡库存统计")
public String selectFpStock(){
public String selectFpStock() {
return JSONArray.toJSONString(service.selectFpStock());
}
@PostMapping("/selectTeamGroups")
@ApiOperation("班组是早晚")
public String selectTeamGroups(){
Integer state=iBroadDruidService.selectTeamGroups();
Map<String,Integer> map=new HashMap<>();
map.put("班组",state);
public String selectTeamGroups() {
Integer state = iBroadDruidService.selectTeamGroups();
Map<String, Integer> map = new HashMap<>();
map.put("班组", state);
return JSONObject.toJSONString(map);
}
}

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

@ -27,6 +27,7 @@ public interface BroadDataMapper {
// 发泡线
///////////////////////////////////////////////////////////////////////////
List<OrderInfo> fp_selectOrderExecution();
List<OrderInfo> fp_selectOrderExecutionDay();
List<OrderInfo> fp_selectOrderExecutionPlan();
///////////////////////////////////////////////////////////////////////////

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

@ -100,4 +100,5 @@ public interface IBroadDataService {
List<BoxOutput> pqk_selectProductInStore();
List<OrderInfo> fp_selectOrderExecutionDay();
}

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

@ -66,6 +66,13 @@ public class BroadDataServiceImpl implements IBroadDataService
public List<OrderInfo> fp_selectOrderExecution(){
return mapper.fp_selectOrderExecution();
}
@Override
public List<OrderInfo> fp_selectOrderExecutionDay(){
return mapper.fp_selectOrderExecutionDay();
}
@Override
public List<OrderInfo> fp_selectOrderExecutionPlan(){
return mapper.fp_selectOrderExecutionPlan();

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

@ -384,6 +384,138 @@
</select>
<select id="fp_selectOrderExecutionDay" resultType="com.ruoyi.system.domain.OrderInfo">
select name,
STATION_NO,
target,
status,
plan_number,
(h1 + h2 + h3 + h4 + h5 + h6 + h7 + H8 + h9 + H10 + h11 + h12) as qty,
round((h1 + h2 + h3 + h4 + h5 + h6 + h7 + H8 + h9 + H10 + h11 + h12) / CURRENTPLAN_QTY * 100, 2) as rate,
h1,
h2,
h3,
h4,
h5,
h6,
h7,
H8,
h9,
H10,
h11,
h12
from (
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,
STATION_NO,
(select QTY
from (select QTY, row_number() over (order by CREATE_TIME desc) row_n from HAIWEI.BASE_FP_PLANQTY)
where row_n = 1) as target,
case
when PRODUCT_STATUS = 0 then '未生产'
else '生产中' end as status,
nvl(plan_number, 0) as plan_number,
PRODUCT_QTY as qty,
round(PRODUCT_QTY / CURRENTPLAN_QTY * 100, 2) as rate,
CURRENTPLAN_QTY,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '07:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY1
else 0 end as h1,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '08:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY2
else 0 end as h2,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '09:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY3
else 0 end as h3,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '10:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY4
else 0 end as h4,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '11:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY5
else 0 end as h5,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '12:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY6
else 0 end h6,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '13:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY7
else 0 end h7,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '14:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY8
else 0 end h8,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '15:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY9
else 0 end h9,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '16:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY10
else 0 end h10,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '17:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY11
else 0 end h11,
case
when sysdate &gt;
to_date(to_char(sysdate, 'yyyy-mm-dd') || '18:29:59', 'yyyy-mm-dd hh24:mi:ss')
then
HOUR_QTY12
else 0 end h12
from IMOS_PR_FOAMING_MONITOR ipr
left join (
select round(PLAN_QTY / num, 0) as plan_number, itm.MATERIAL_NAME AS NAME
from imos_ta_material itm
left join (select count(1) as num, MATERIAL_NAME
from IMOS_PR_FOAMING_MONITOR
group by MATERIAL_NAME) cou
on cou.MATERIAL_NAME = itm.MATERIAL_NAME
where DISPLAY_FLAG = 1
) ta
on ta.name = ipr.MATERIAL_NAME
order by to_number(STATION_NO))
</select>
<select id="fp_selectOrderExecution" resultType="com.ruoyi.system.domain.OrderInfo">
select substr(MATERIAL_NAME,
case

Write Preview
Loading…
Cancel
Save