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

修改 总装

Browse Source
master
wangh 3 years ago
parent 510c515e3a
commit a0e00b2e5e
6 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File

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

@ -65,6 +65,8 @@ public class BoxBroadController {
@ApiOperation("箱壳按小时查询产量")
public String selectOutputByTime() {
List<BoxOutput> info = service.selectOutputByTime();
BoxOutput info1 = service.selectOutputByTimeDY();
info.add(info1);
String jsonInfo = JSONArray.toJSONString(info);
System.out.println("根据型号统计产量：" + jsonInfo);
return jsonInfo;

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

@ -74,4 +74,6 @@ public interface BroadDataMapper {
List<BoxOutput> selectOneBadRate();
List<BoxOutput> selectOneBadRateByDay();
BoxOutput selectOutputByTimeDY();
}

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

@ -58,4 +58,6 @@ public interface IBroadDataService {
List<BoxOutput> selectOneBadRate();
List<BoxOutput> selectOneBadRateByDay();
BoxOutput selectOutputByTimeDY();
}

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

@ -61,6 +61,11 @@ public class BroadDataServiceImpl implements IBroadDataService
return mapper.fp_selectOrderExecution();
}
@Override
public BoxOutput selectOutputByTimeDY() {
return mapper.selectOutputByTimeDY();
}
@Override
public List<DeviceStation> fp_selectDeviceStation() {
return mapper.fp_selectDeviceStation();

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java
Unescape Escape View File

@ -18,7 +18,7 @@ import java.util.List;
public class BroadDruidServiceImpl implements IBroadDruidService {
@Autowired
private BroadDataMapper mapper;
//定时生成产量
public void createWork(){
BoxOutput boxOutput=mapper.selectNowXkOutPut();
int nowOut=boxOutput.getQty();

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

@ -137,46 +137,50 @@
order by START_TIME desc
</select>
<select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
-- select TO_CHAR(CREATION_DATE, 'hh24')||':30' as name ,Count(TASK_ID) as qty
-- from IMOS_LO_TASK_HISTORY
-- where detial_type_code = '1002'
-- and TASK_TYPE != 'O'
-- and TO_CHAR(CREATION_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
-- and TO_CHAR(CREATION_DATE, 'hh24') > 7
-- group by TO_CHAR(CREATION_DATE, 'hh24')
-- order by name
select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name, Count(TASK_ID) as qty
from (
select CREATION_DATE, TASK_ID
from IMOS_LO_TASK_HISTORY
where detial_type_code = '1002'
and TASK_TYPE != 'O'
and CREATION_DATE &gt;
case
when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
'yyyy-MM-dd hh24:mi:ss')
when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
'yyyy-MM-dd hh24:mi:ss')
else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
end
and CREATION_DATE &lt;
case
when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
'yyyy-MM-dd hh24:mi:ss')
when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
'yyyy-MM-dd hh24:mi:ss')
else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
end
-- and CREATION_DATE between
-- to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss')
-- and
-- to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
)
<select id="selectOutputByTimeDY" resultType="com.ruoyi.system.domain.BoxOutput">
select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name,
sum(ACTUAL_QTY) as qty
from IMOS_PR_PLAN t
where process_code = 1002
and delete_flag = '0'
and CREATION_DATE > (select *
from (select CREATE_TIME from HAIWEI.XK_H_QTY order by CREATE_TIME desc)
where ROWNUM = 1)
group by TO_CHAR(CREATION_DATE, 'hh24')
order by name
</select>
<select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
select H_NAME as name ,QTY_C as qty from HAIWEI.XK_H_QTY xhq
left join (select * from haiwei.BASE_DAY_WBTIME where ROWNUM = 1 order by CREATE_TIME desc) wb on 1 = 1
where xhq.CREATE_TIME between case when sysdate &lt;= wb.W_END then W_START else W_END end
and case when sysdate &lt;= wb.W_END then W_END else B_END end
order by xhq.CREATE_TIME
-- select TO_CHAR(CREATION_DATE, 'hh24') || ':30' as name, Count(TASK_ID) as qty
-- from (
-- select CREATION_DATE, TASK_ID
-- from IMOS_LO_TASK_HISTORY
-- where detial_type_code = '1002'
-- and TASK_TYPE != 'O'
-- and CREATION_DATE &gt;
-- case
-- when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-- to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-- 'yyyy-MM-dd hh24:mi:ss')
-- when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00',
-- 'yyyy-MM-dd hh24:mi:ss')
-- else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss')
-- end
-- and CREATION_DATE &lt;
-- case
-- when to_char(sysdate, 'hh24') &gt; 7 and to_char(sysdate, 'hh24') &lt; 20 then to_date(
-- to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00',
-- 'yyyy-MM-dd hh24:mi:ss')
-- when to_char(sysdate, 'hh24') &lt; 7 then to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00',
-- 'yyyy-MM-dd hh24:mi:ss')
-- else to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '24:00:00', 'yyyy-MM-dd hh24:mi:ss')
-- end
-- )
-- group by TO_CHAR(CREATION_DATE, 'hh24')
-- order by name
</select>

Write Preview
Loading…
Cancel
Save