diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java index 9466138..94c7c1f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/AllBroadHTMLController.java @@ -58,7 +58,7 @@ public class AllBroadHTMLController { public String week() { return "broad/week"; } - //5 周 + //5 yue @GetMapping("/month") public String month() { return "broad/month"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java index 4d5eafe..fe3b828 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/BoxBroadController.java @@ -30,7 +30,7 @@ public class BoxBroadController { @PostMapping("/planCompletion") @ApiOperation("箱壳查询计划数量完成情况") public String selectplanCompletion() { - BoxPlanCompletion completion = service.selectplanCompletion("1002"); + BoxPlanCompletion completion = service.selectplanCompletion(); return JSONObject.toJSONString(completion); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java index 2414763..9126936 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/ZZJXBroadController.java @@ -37,11 +37,17 @@ public class ZZJXBroadController { private String selectProductInByTeam(@PathVariable("id") int id) { if (id == 0) { + int tag = service.zz_countNightProductIn(); + if (tag > 0) { + return JSONArray.toJSONString(service.zz_selectProductInByTeamNight()); + } return JSONArray.toJSONString(service.zz_selectProductInByTeam()); + } else { return JSONArray.toJSONString(service.zz_selectProductInByDay()); } } + @PostMapping("/selectProductInTarget") @ApiOperation("成品入库统计-目标") private String selectProductInTarget() { @@ -51,38 +57,48 @@ public class ZZJXBroadController { @PostMapping("/selectLossInfo") @ApiOperation("查询Loss和分布") private String selectLossInfo() { - return JSONArray.toJSONString(service.zz_selectLossInfo()); + int tag = service.zz_countNightProductIn(); + if (tag > 0) { + return JSONArray.toJSONString(service.zz_selectLossInfo(2)); + } + return JSONArray.toJSONString(service.zz_selectLossInfo(1)); } + @PostMapping("/selectOneBadRate/{id}") @ApiOperation("一次不合格率") - private String selectOneBadRate(@PathVariable("id")int id){ - if (id==0){ + private String selectOneBadRate(@PathVariable("id") int id) { + if (id == 0) { // ban - return JSONArray.toJSONString(service.selectOneBadRate()); - }else { + int tag = service.zz_countNightProductIn(); + if (tag > 0) { + return JSONArray.toJSONString(service.selectOneBadRate(2)); + } + return JSONArray.toJSONString(service.selectOneBadRate(1)); + } else { // tian return JSONArray.toJSONString(service.selectOneBadRateByDay()); } } + @PostMapping("/selectOneBadRateMb") @ApiOperation("一次不合格率目标") - private String selectOneBadRateMb( ){ + private String selectOneBadRateMb() { - return JSONArray.toJSONString(service.zz_selectOneBadRateMb()); + return JSONArray.toJSONString(service.zz_selectOneBadRateMb()); } + @PostMapping("/selectInStoreTag") @ApiOperation("入库节拍") - private String selectInStoreTag(){ + private String selectInStoreTag() { return JSONObject.toJSONString(BroadDruidServiceImpl.zz_selectInStoreTag()); } + @PostMapping("/selectInStoreOrderInfo") @ApiOperation("入库执行订单") - private String selectInStoreOrderInfo(){ + private String selectInStoreOrderInfo() { return JSONObject.toJSONString(service.zz_selectInStoreOrderInfo()); } - - } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index 5151190..685994a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -63,15 +63,16 @@ public interface BroadDataMapper { // 6// zz_() /////////////////////////////////////////////////////////////////////////// List zz_selectProductInByTeam(); + List zz_selectProductInByTeamNight(); List zz_selectProductInByDay(); - List zz_selectLossInfo(); + List zz_selectLossInfo(int state); void insertTimp1(); void deleteTimp1(); - List selectOneBadRate(); + List selectOneBadRate(int state); List selectOneBadRateByDay(); @@ -95,7 +96,7 @@ public interface BroadDataMapper { List mtk_sselectQATop3(); List mtk_selectQAZD(); - + int zz_countNightProductIn(); /////////////////////////////////////////////////////////////////////////// // 周看板 /////////////////////////////////////////////////////////////////////////// @@ -108,4 +109,6 @@ public interface BroadDataMapper { List zhou_selectOrderRateTatle(); List yue_selectProductInStore(); + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index cc68e72..4dedf10 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -11,7 +11,7 @@ import java.util.List; public interface IBroadDataService { - BoxPlanCompletion selectplanCompletion(String gxid); + BoxPlanCompletion selectplanCompletion(); List selectStock(String id); @@ -52,11 +52,12 @@ public interface IBroadDataService { List mtk_selectInStore3d(); List zz_selectProductInByTeam(); + List zz_selectProductInByTeamNight(); List zz_selectProductInByDay(); - List selectOneBadRate(); + List selectOneBadRate(int state); List selectOneBadRateByDay(); @@ -78,7 +79,7 @@ public interface IBroadDataService { List mtk_sselectQATop3(); - List zz_selectLossInfo(); + List zz_selectLossInfo(int state); List mtk_selectQAZD(); @@ -89,4 +90,6 @@ public interface IBroadDataService { List zhou_selectOrderRateTatle(); List yue_selectProductInStore(); + + int zz_countNightProductIn(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index 49149bd..358448d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -24,7 +24,7 @@ public class BroadDataServiceImpl implements IBroadDataService @Override - public BoxPlanCompletion selectplanCompletion(String gxid) { + public BoxPlanCompletion selectplanCompletion() { return mapper.selectplanCompletion(); } @@ -148,14 +148,23 @@ public class BroadDataServiceImpl implements IBroadDataService @Override - public List zz_selectLossInfo() { - return mapper.zz_selectLossInfo(); + public int zz_countNightProductIn() { + return mapper.zz_countNightProductIn(); + } + + @Override + public List zz_selectLossInfo(int state) { + return mapper.zz_selectLossInfo( state); } @Override public List zz_selectProductInByTeam() { return mapper.zz_selectProductInByTeam(); } + @Override + public List zz_selectProductInByTeamNight() { + return mapper.zz_selectProductInByTeamNight(); + } @Override public List zz_selectProductInByDay() { @@ -163,8 +172,8 @@ public class BroadDataServiceImpl implements IBroadDataService } @Override - public List selectOneBadRate() { - return mapper.selectOneBadRate(); + public List selectOneBadRate(int state) { + return mapper.selectOneBadRate(state); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java index 42d9a0c..dfb20b3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDruidServiceImpl.java @@ -40,9 +40,9 @@ public class BroadDruidServiceImpl implements IBroadDruidService { @Override public List zz_selectLossInfo() { - mapper.deleteTimp1(); - mapper.insertTimp1(); - return mapper.zz_selectLossInfo(); +// mapper.deleteTimp1(); +// mapper.insertTimp1(); + return mapper.zz_selectLossInfo(1); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index b275ebf..6c060af 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -13,16 +13,9 @@ select ROUND(sum(ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM) / 60, 2)- - -nvl(case + nvl(case when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss') then case @@ -556,8 +549,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t1 left join (select row_number() over (order by PRODUCTION_DATE) as row_number, @@ -567,8 +566,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1 left join (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1 @@ -587,8 +592,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t1 left join (select row_number() over (order by PRODUCTION_DATE) as row_number, @@ -598,8 +609,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1 left join (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1 @@ -616,8 +633,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t1 left join (select row_number() over (order by PRODUCTION_DATE) as row_number, @@ -627,8 +650,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1 left join (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1 @@ -638,6 +667,10 @@ where 180 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM union +select + case when qty < 0 then 0 else qty end as qty,name + from + ( select count(1)-nvl(case when sysdate > to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '09:30:00', 'yyyy-MM-dd hh24:mi:ss') then @@ -654,8 +687,14 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t1 left join (select row_number() over (order by PRODUCTION_DATE) as row_number, @@ -665,13 +704,20 @@ from (select row_number() over (order by PRODUCTION_DATE) as row_number, from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where ippb.PRODUCTION_DATE between case when sysdate < = wb.W_END then W_START else W_END end - and case when sysdate < = wb.W_END then W_END else B_END end + where ippb.PRODUCTION_DATE between + case + when #{state} = 1 then W_START + when #{state} = 2 then W_END end + and + case + when #{state} = 1 then W_END + when #{state} = 2 then B_END end and DETIAL_TYPE_CODE = '1004') t2 on t1.row_number = t2.row_number + 1 left join (select * from (select RHYTHM from haiwei.BASE_RHYTHM order by ID desc) where ROWNUM = 1) t3 on 1 = 1 where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM +) + @@ -864,7 +1052,11 @@ where DETIAL_TYPE_CODE = '1004' order by name @@ -1053,7 +1261,16 @@ where DETIAL_TYPE_CODE = '1004' - + - select to_number(to_char(PRODUCTION_DATE, 'MM')) as name, count(1) as qty from IMOS.IMOS_PR_PRODUCT_BARCODE where PRODUCTION_DATE > TRUNC(sysdate, 'YYYY')