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 ab178de99b
commit 0d611d1ee3
7 changed files with 111 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class RuoYiApplication
{
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
System.out.println("(♥◠‿◠)ﾉﾞ 启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +

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

@ -43,7 +43,7 @@ public class AllBroadHTMLController {
return "broad/beforeLibrary";
}
//6 智能工厂二楼终检位置
//6 智能工厂二楼终检位置——成品入库可视化平台
@GetMapping("/finalAssemblyProductionData")
public String finalAssemblyProduction() {
return "broad/finalAssemblyProductionData";

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

@ -38,12 +38,12 @@ public class ZZJXBroadController {
if (id == 0) {
// int tag = service.zz_countNightProductIn();
int tag = service.zz_countNightProductInTag();
if (tag > 0) {
Integer tag = service.zz_countNightProductInTag();
if (tag!=null&&tag > 0) {
return JSONArray.toJSONString(service.zz_selectProductInByTeamNight());
}
return JSONArray.toJSONString(service.zz_selectProductInByTeam());
//return null;
} else {
return JSONArray.toJSONString(service.zz_selectProductInByDay());
}

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

@ -122,5 +122,5 @@ public interface BroadDataMapper {
void deleteBoxOutput();
int zz_countNightProductInTag();
Integer zz_countNightProductInTag();
}

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

@ -80,7 +80,7 @@ public interface IBroadDataService {
List<MTKBeen> mtk_sselectQATop3();
int zz_countNightProductInTag();
Integer zz_countNightProductInTag();
List<BoxOutput> zz_selectLossInfo(int state);
List<BoxOutput> mtk_selectQAZD();

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

@ -170,7 +170,7 @@ public class BroadDataServiceImpl implements IBroadDataService
}
@Override
public int zz_countNightProductInTag() {
public Integer zz_countNightProductInTag() {
return mapper.zz_countNightProductInTag();
}

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

@ -736,83 +736,122 @@
from haiwei.BASE_PRODUCT_QTY
where DAY between (TRUNC(sysdate, 'D') + 1) and (TRUNC(sysdate, 'D') + 7)
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 1)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 1), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
) group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 1)
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 2)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 2)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
select to_char((TRUNC(sysdate, 'D') + 2), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 3)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 4)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 5)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 6)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(bpq.DAY, 'MM-dd') as day, W_START, B_END
from haiwei.BASE_PRODUCT_QTY bpq
left join haiwei.BASE_DAY_WBTIME wb
on to_char(bpq.DAY, 'yyyy-MM-dd') = wb.CREATE_DAY
where DAY = (TRUNC(sysdate, 'D') + 7)
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 3)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 3), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss')= (TRUNC(sysdate, 'D') + 4)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 4), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 5)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 5), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss') = (TRUNC(sysdate, 'D') + 6)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 6), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
union
select code, sum(qty), name
from (
select wb.day as code, count(1) as qty, '产量' as name
from IMOS.IMOS_PR_PRODUCT_BARCODE ba
left join (select to_char(to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss'), 'MM-dd') as day, W_START, B_END
from haiwei.BASE_DAY_WBTIME
where to_date(CREATE_DAY, 'yyyy-MM-dd hh:mi:ss')= (TRUNC(sysdate, 'D') + 7)
) wb on 1 = 1
where PRODUCTION_DATE between W_START and B_END
group by wb.day
union
select to_char((TRUNC(sysdate, 'D') + 7), 'MM-dd') as code, 0 as qty, '产量' as name
from dual
)
group by code, name
</select>

Write Preview
Loading…
Cancel
Save