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 ad0c3917c6 08aa7e3465
commit 0e3d40c2e8
9 changed files with 146 additions and 15 deletions
Show Stats Download Patch File Download Diff File

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

@ -63,14 +63,14 @@ public class BoxBroadController {
return jsonInfo;
}
/* @PostMapping("/selectOutputByTime")
@PostMapping("/selectOutputByTime")
@ApiOperation("箱壳按小时查询产量")
public String selectOutputByTime() {
Integer state=BroadDruidServiceImpl.selectTeamGroups();
if (state==0){
List<BoxOutput> info = service.selectOutputByTime();
return JSONArray.toJSONString(service.selectOutputByTime());
}
return JSONArray.toJSONString();
return JSONArray.toJSONString(service.selectOutputByTime1());
// BoxOutput boxOutput= info.get(0);
// info.remove(0);
// int qty = BroadDruidServiceImpl.selectNowXkOutPut();//实时的数量
@ -90,7 +90,7 @@ public class BoxBroadController {
// String jsonInfo = JSONArray.toJSONString(info);
// System.out.println("根据型号统计产量：" + jsonInfo);
// return jsonInfo;
}*/
}

3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseQiMapper.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.BaseQi;
import com.ruoyi.system.domain.MTKBeen;
/**
* 月看板-品质提升维护Mapper接口
@ -59,5 +60,5 @@ public interface BaseQiMapper
*/
public int deleteBaseQiByIds(String[] ids);
List<BaseQi> selectBaseQiList1();
List<MTKBeen> selectBaseQiList1();
}

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

@ -21,6 +21,7 @@ public interface BroadDataMapper {
List<OrderInfo> getUHullPlanInfo(String id);
List<BoxOutput> selectOutputByTime();
List<BoxOutput> selectOutputByTime1();
///////////////////////////////////////////////////////////////////////////
// 发泡线

3
ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseQiService.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.BaseQi;
import com.ruoyi.system.domain.MTKBeen;
/**
* 月看板-品质提升维护Service接口
@ -59,5 +60,5 @@ public interface IBaseQiService
*/
public int deleteBaseQiById(Long id);
List<BaseQi> selectBaseQiList1();
List<MTKBeen> selectBaseQiList1();
}

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

@ -20,6 +20,7 @@ public interface IBroadDataService {
List<OrderInfo> getUHullPlanInfo(String id);
List<BoxOutput> selectOutputByTime();
List<BoxOutput> selectOutputByTime1();
@ -94,4 +95,6 @@ public interface IBroadDataService {
int zz_countNightProductIn();
List<BoxOutput> yue_selectMonthQANumber();
}

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

@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
import java.util.List;
import com.ruoyi.system.domain.MTKBeen;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.BaseQiMapper;
@ -93,7 +95,7 @@ public class BaseQiServiceImpl implements IBaseQiService
}
@Override
public List<BaseQi> selectBaseQiList1() {
public List<MTKBeen> selectBaseQiList1() {
return baseQiMapper.selectBaseQiList1();
}
}

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

@ -49,6 +49,10 @@ public class BroadDataServiceImpl implements IBroadDataService
public List<BoxOutput> selectOutputByTime() {
return mapper.selectOutputByTime();
}
@Override
public List<BoxOutput> selectOutputByTime1() {
return mapper.selectOutputByTime1();
}
@Override
public List<OrderInfo> xk_selectStockOccupancy() {

13
ruoyi-system/src/main/resources/mapper/system/BaseQiMapper.xml
Unescape Escape View File

@ -16,8 +16,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select id, year_name, rate, type from base_qi
</sql>
<select id="selectBaseQiList1" resultMap="BaseQiResult">
select id, year_name, rate, sdd.DICT_LABEL
<resultMap id="MTKBeen" type="com.ruoyi.system.domain.MTKBeen">
<result column="code" property="code"/>
<collection property="list" javaType="java.util.List" resultMap="BoxOutputBeen"/>
</resultMap>
<resultMap id="BoxOutputBeen" type="com.ruoyi.system.domain.BoxOutput">
<result column="name" property="name"/>
<result column="qty" property="qty"/>
<result column="rate" property="rate"/>
</resultMap>
<select id="selectBaseQiList1" resultMap="MTKBeen">
select year_name as name , rate , sdd.DICT_LABEL as code
from base_qi bq
left join SYS_DICT_DATA sdd on TYPE = sdd.DICT_VALUE
and sdd.DICT_TYPE = 'quality_improvement_name'

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

@ -67,7 +67,7 @@
when instr(name, '/', 1, 1) = 0 then instr(name, ',', 1, 1) + 1
else instr(name, '/', 1, 1) + 1
end) as name,
sum(QTY3)
sum(QTY3) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD xhq
left join (select * from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb
on 1 = 1
@ -111,11 +111,121 @@
</select>
<select id="selectOutputByTime" resultType="com.ruoyi.system.domain.BoxOutput">
select H_NAME as name ,QTY_C as qty,ZS_C as record_qty from HAIWEI.XK_H_QTY xhq
left join (select * from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) 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 '07:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '08:30:00', 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '08:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '08:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '09:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '09:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '09:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '10:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '10:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '10:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '11:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '11:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '11:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '12:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '12:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '12:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '13:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '13:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '13:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '14:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '14:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '14:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '15:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '15:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '15:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '16:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '16:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '16:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '17:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '17:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '17:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '18:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
union
select '18:30' as name, nvl(sum(QTY3),0) as qty
from IMOS.BASE_BOX_OUTPUT_RECORD
where CREATE_TIME &gt;= to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '18:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and CREATE_TIME &lt; to_date(to_char(SYSDATE
, 'yyyy-MM-dd') || '19:30:00'
, 'yyyy-MM-dd hh24:mi:ss')
and qty3>0
</select>

Write Preview
Loading…
Cancel
Save