From 7e7221183a7d7dcc7810c895e2d5a8450774a415 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 13 Aug 2024 21:14:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/quality/mapper/QcInterfaceMapper.java | 2 + .../service/impl/QcInterfaceServiceImpl.java | 323 +++++++++--------- .../mapper/quality/QcInterfaceMapper.xml | 40 ++- 3 files changed, 190 insertions(+), 175 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java index 72d13e7b..a125d650 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcInterfaceMapper.java @@ -49,4 +49,6 @@ public interface QcInterfaceMapper { @MapKey("nameDate") Map getLineChartsDatas(QcInterface qcInterface); + + QcInterface getProduceHz1(QcInterface qcInterface); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java index 76ff9cd1..06758278 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java @@ -82,32 +82,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { String nowYMD = DateUtils.getDate(); qcInterface.setYmd(nowYMD); - //生产打开List dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface); - /**质量看板测试开始**/ - List dtos = new ArrayList<>(); - QcInterface q0 = new QcInterface(); - q0.setProjectName("热贮稳定性"); - q0.setQuality("1"); - dtos.add(q0); - QcInterface q1 = new QcInterface(); - q1.setProjectName("[香坯包膜]15mm＜爆口直径"); - q1.setQuality("2"); - dtos.add(q1); - QcInterface q2 = new QcInterface(); - q2.setProjectName("其它不良现象"); - q2.setQuality("5"); - dtos.add(q2); - QcInterface q3 = new QcInterface(); - q3.setProjectName("眼头插孔"); - q3.setQuality("1"); - dtos.add(q3); - QcInterface q4 = new QcInterface(); - q4.setProjectName("厚度（一盘）"); - q4.setQuality("2"); - dtos.add(q4); - - - /**质量看板测试结束**/ + List dtos = qcInterfaceMapper.getCheckProjectsPie(qcInterface); return dtos; } @@ -163,68 +138,68 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { dto.setCheckStatus("0".equals(dto.getCheckStatus()) ? "待检测" : "检测完成"); dto.setCheckResult("Y".equals(dto.getCheckResult()) ? "合格" : "不合格"); } - /**质量看板测试开始**/ - QcInterface q0 = new QcInterface(); - q0.setCheckNo("20240305001"); - q0.setIncomeBatchNo("20270122LJ20240123BBBA0G"); - q0.setOrderNo("000800000083-1"); - q0.setMaterialName("10小时无烟型黑蚊香(繁体)纸盒"); - q0.setQuality("19000"); - q0.setUnit("个"); - q0.setSupplierName("中山市粤华包装有限公司"); - q0.setIncomeTime("2024-03-05 00:00:00"); - q0.setCheckTime("2024-03-05 11:32:00"); - q0.setCheckResult("合格"); - q0.setCheckManName("马娥章"); - q0.setCheckName("来料检验"); - dtos.add(q0); - - QcInterface q1 = new QcInterface(); - q1.setCheckNo("20240306002"); - q1.setIncomeBatchNo("20270122LJ20240123BCCA0F"); - q1.setOrderNo("0008000001093-1"); - q1.setMaterialName("依素猫狗(黄色)气雾盖"); - q1.setQuality("5000"); - q1.setUnit("个"); - q1.setSupplierName("广州盛盈环保科技有限公司"); - q1.setIncomeTime("2024-03-05 00:00:00"); - q1.setCheckTime("2024-03-05 13:32:00"); - q1.setCheckResult("合格"); - q1.setCheckManName("马娥章"); - q1.setCheckName("来料检验"); - dtos.add(q1); - - QcInterface q2 = new QcInterface(); - q2.setCheckNo("20240307002"); - q2.setIncomeBatchNo("20270122LJ20240456BCCA0D"); - q2.setOrderNo("0008000001193-1"); - q2.setMaterialName("King Brand蚊片(450装)纸箱"); - q2.setQuality("5800"); - q2.setUnit("个"); - q2.setSupplierName("广州市网能产品设计有限公司"); - q2.setIncomeTime("2024-08-06 00:00:00"); - q2.setCheckTime("2024-08-06 13:42:00"); - q2.setCheckResult("合格"); - q2.setCheckManName("马娥章"); - q2.setCheckName("来料检验"); - dtos.add(q2); - - QcInterface q3 = new QcInterface(); - q3.setCheckNo("20240308001"); - q3.setIncomeBatchNo("20270122LJ20240456BCBB0D"); - q3.setOrderNo("0008000001203-1"); - q3.setMaterialName("榄菊牌清香型蚊液(空白)纸箱"); - q3.setQuality("7800"); - q3.setUnit("个"); - q3.setSupplierName("广州市网能产品设计有限公司"); - q3.setCheckTime("2024-03-05 13:50:00"); - q3.setIncomeTime("2024-08-06 00:00:00"); - q3.setCheckResult("合格"); - q3.setCheckManName("马娥章"); - q3.setCheckName("来料检验"); - dtos.add(q3); - - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// QcInterface q0 = new QcInterface(); +// q0.setCheckNo("20240305001"); +// q0.setIncomeBatchNo("20270122LJ20240123BBBA0G"); +// q0.setOrderNo("000800000083-1"); +// q0.setMaterialName("10小时无烟型黑蚊香(繁体)纸盒"); +// q0.setQuality("19000"); +// q0.setUnit("个"); +// q0.setSupplierName("中山市粤华包装有限公司"); +// q0.setIncomeTime("2024-03-05 00:00:00"); +// q0.setCheckTime("2024-03-05 11:32:00"); +// q0.setCheckResult("合格"); +// q0.setCheckManName("马娥章"); +// q0.setCheckName("来料检验"); +// dtos.add(q0); +// +// QcInterface q1 = new QcInterface(); +// q1.setCheckNo("20240306002"); +// q1.setIncomeBatchNo("20270122LJ20240123BCCA0F"); +// q1.setOrderNo("0008000001093-1"); +// q1.setMaterialName("依素猫狗(黄色)气雾盖"); +// q1.setQuality("5000"); +// q1.setUnit("个"); +// q1.setSupplierName("广州盛盈环保科技有限公司"); +// q1.setIncomeTime("2024-03-05 00:00:00"); +// q1.setCheckTime("2024-03-05 13:32:00"); +// q1.setCheckResult("合格"); +// q1.setCheckManName("马娥章"); +// q1.setCheckName("来料检验"); +// dtos.add(q1); +// +// QcInterface q2 = new QcInterface(); +// q2.setCheckNo("20240307002"); +// q2.setIncomeBatchNo("20270122LJ20240456BCCA0D"); +// q2.setOrderNo("0008000001193-1"); +// q2.setMaterialName("King Brand蚊片(450装)纸箱"); +// q2.setQuality("5800"); +// q2.setUnit("个"); +// q2.setSupplierName("广州市网能产品设计有限公司"); +// q2.setIncomeTime("2024-08-06 00:00:00"); +// q2.setCheckTime("2024-08-06 13:42:00"); +// q2.setCheckResult("合格"); +// q2.setCheckManName("马娥章"); +// q2.setCheckName("来料检验"); +// dtos.add(q2); +// +// QcInterface q3 = new QcInterface(); +// q3.setCheckNo("20240308001"); +// q3.setIncomeBatchNo("20270122LJ20240456BCBB0D"); +// q3.setOrderNo("0008000001203-1"); +// q3.setMaterialName("榄菊牌清香型蚊液(空白)纸箱"); +// q3.setQuality("7800"); +// q3.setUnit("个"); +// q3.setSupplierName("广州市网能产品设计有限公司"); +// q3.setCheckTime("2024-03-05 13:50:00"); +// q3.setIncomeTime("2024-08-06 00:00:00"); +// q3.setCheckResult("合格"); +// q3.setCheckManName("马娥章"); +// q3.setCheckName("来料检验"); +// dtos.add(q3); +// +// /**质量看板测试结束**/ return dtos; } @@ -236,40 +211,50 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { Map dtoMap = new HashMap<>(); qcInterface.setYmdType("dd"); - QcInterface hz = qcInterfaceMapper.getProduceHz(qcInterface); - if (hz != null) { - dtoMap.put("todayPro", hz.getQuality()); - dtoMap.put("todaySample", hz.getSampleQuality()); - dtoMap.put("todayNoOk", hz.getNoOkQuality()); - BigDecimal tOkRate = (new BigDecimal(hz.getSampleQuality()) - .subtract(new BigDecimal(hz.getNoOkQuality())) + QcInterface hz0 = qcInterfaceMapper.getProduceHz1(qcInterface); + if (hz0 != null) { + dtoMap.put("todayPro", hz0.getQuality().replaceAll("\\..*", "")); + }else{ + dtoMap.put("todayPro", "0"); + } + QcInterface hz1 = qcInterfaceMapper.getProduceHz(qcInterface); + if (hz1 != null) { + dtoMap.put("todaySample", hz1.getSampleQuality().replaceAll("\\..*", "")); + dtoMap.put("todayNoOk", hz1.getNoOkQuality().replaceAll("\\..*", "")); + BigDecimal tOkRate = (new BigDecimal(hz1.getSampleQuality()) + .subtract(new BigDecimal(hz1.getNoOkQuality())) ) .multiply(new BigDecimal(100)) - .divide(new BigDecimal(hz.getQuality()), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(hz1.getSampleQuality()), 2, RoundingMode.HALF_UP); dtoMap.put("todayOkRate", tOkRate + "%"); } qcInterface.setYmdType("mm"); + QcInterface hz20 = qcInterfaceMapper.getProduceHz1(qcInterface); + if (hz20 != null) { + dtoMap.put("monthPro", hz20.getQuality().replaceAll("\\..*", "")); + }else{ + dtoMap.put("monthPro", "0"); + } QcInterface hz2 = qcInterfaceMapper.getProduceHz(qcInterface); if (hz2 != null) { - dtoMap.put("monthPro", hz2.getQuality()); - dtoMap.put("monthNoOk", hz2.getNoOkQuality()); + dtoMap.put("monthNoOk", hz2.getNoOkQuality().replaceAll("\\..*", "")); BigDecimal tOkRate2 = (new BigDecimal(hz2.getSampleQuality()) .subtract(new BigDecimal(hz2.getNoOkQuality())) ) .multiply(new BigDecimal(100)) - .divide(new BigDecimal(hz2.getQuality()), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(hz2.getSampleQuality()), 2, RoundingMode.HALF_UP); dtoMap.put("monthOkRate", tOkRate2 + "%"); } - /**质量看板测试开始**/ - dtoMap.put("todayPro", "3800"); - dtoMap.put("todaySample", "50"); - dtoMap.put("todayNoOk", "2"); - dtoMap.put("todayOkRate", "96.00%"); - dtoMap.put("monthPro", "83600"); - dtoMap.put("monthNoOk", "30"); - dtoMap.put("monthOkRate", "99.96%"); - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// dtoMap.put("todayPro", "3800"); +// dtoMap.put("todaySample", "50"); +// dtoMap.put("todayNoOk", "2"); +// dtoMap.put("todayOkRate", "96.00%"); +// dtoMap.put("monthPro", "83600"); +// dtoMap.put("monthNoOk", "30"); +// dtoMap.put("monthOkRate", "99.96%"); +// /**质量看板测试结束**/ return dtoMap; } @@ -298,7 +283,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { List monthData = new ArrayList<>(); for (int mh = 1; mh <= nowMonth; mh++) { - String yyyymm = nowYMDs[1] + "-" + String.format("%02d", mh); + String yyyymm = nowYMDs[0] + "-" + String.format("%02d", mh); monthNames.add(yyyymm); if (!CollectionUtils.isEmpty(noOkHzs)&&noOkHzs.get(yyyymm)!=null) { monthData.add(noOkHzs.get(yyyymm).getNoOkQuality()); @@ -309,18 +294,18 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { dtoMap.put("month", monthNames); dtoMap.put("monthData", monthData); - /**质量看板测试开始**/ - List monthNames0 = new ArrayList<>(); - monthNames0.add("2024-01");monthNames0.add("2024-02");monthNames0.add("2024-03");monthNames0.add("2024-04"); - monthNames0.add("2024-05");monthNames0.add("2024-06");monthNames0.add("2024-07");monthNames0.add("2024-08"); - monthNames0.add("2024-09");monthNames0.add("2024-10");monthNames0.add("2024-11");monthNames0.add("2024-12"); - List monthData0 = new ArrayList<>(); - monthData0.add("5");monthData0.add("4");monthData0.add("7");monthData0.add("10");monthData0.add("5"); - monthData0.add("4");monthData0.add("9");monthData0.add("12");monthData0.add("3");monthData0.add("7"); - monthData0.add("5");monthData0.add("2"); - dtoMap.put("month", monthNames0); - dtoMap.put("monthData", monthData0); - /**质量看板测试结束**/ +// /**质量看板测试开始**/ +// List monthNames0 = new ArrayList<>(); +// monthNames0.add("2024-01");monthNames0.add("2024-02");monthNames0.add("2024-03");monthNames0.add("2024-04"); +// monthNames0.add("2024-05");monthNames0.add("2024-06");monthNames0.add("2024-07");monthNames0.add("2024-08"); +// monthNames0.add("2024-09");monthNames0.add("2024-10");monthNames0.add("2024-11");monthNames0.add("2024-12"); +// List monthData0 = new ArrayList<>(); +// monthData0.add("5");monthData0.add("4");monthData0.add("7");monthData0.add("10");monthData0.add("5"); +// monthData0.add("4");monthData0.add("9");monthData0.add("12");monthData0.add("3");monthData0.add("7"); +// monthData0.add("5");monthData0.add("2"); +// dtoMap.put("month", monthNames0); +// dtoMap.put("monthData", monthData0); +// /**质量看板测试结束**/ return dtoMap; } @@ -392,58 +377,58 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService { } lastYM.setDayStr(daystr0); nowYM.setDayStr(daystr1); -//生产打开 -// qcInterface.setYmd("'" + nowYear + "','" + lastYear + "'"); -// -// Map noOkNum = qcInterfaceMapper.getMothNoOkNum(qcInterface); -// if (noOkNum == null) { -// return null; -// } -// -// List dataBar0 = new ArrayList<>();//不合规数量 -// List dataLine0 = new ArrayList<>();//不合格率 -// for (String day0 : daystr0) { -// QcInterface last = noOkNum.get(day0); -// if (last != null) { -// dataBar0.add(last.getNoOkQuality()); -// BigDecimal norate0 = new BigDecimal(last.getNoOkQuality()).multiply(new BigDecimal(100)) -// .divide(new BigDecimal(last.getQuality()), 2, RoundingMode.HALF_UP); -// dataLine0.add(norate0.toString()); -// } else { -// dataBar0.add("0"); -// dataLine0.add("0.00"); -// } -// } -// -// List dataBar1 = new ArrayList<>();//不合规数量 -// List dataLine1 = new ArrayList<>();//不合格率 -// for (String day1 : daystr1) { -// QcInterface now = noOkNum.get(day1); -// if (now != null) { -// dataBar1.add(now.getNoOkQuality()); -// BigDecimal norate0 = new BigDecimal(now.getNoOkQuality()).multiply(new BigDecimal(100)) -// .divide(new BigDecimal(now.getQuality()), 2, RoundingMode.HALF_UP); -// dataLine1.add(norate0.toString()); -// } else { -// dataBar1.add("0"); -// dataLine1.add("0.00"); -// } -// } - /**质量看板测试开始**/ + //生产打开 + qcInterface.setYmd("'" + nowYear + "','" + lastYear + "'"); + + Map noOkNum = qcInterfaceMapper.getMothNoOkNum(qcInterface); + if (noOkNum == null) { + return null; + } + List dataBar0 = new ArrayList<>();//不合规数量 List dataLine0 = new ArrayList<>();//不合格率 + for (String day0 : daystr0) { + QcInterface last = noOkNum.get(day0); + if (last != null) { + dataBar0.add(last.getNoOkQuality()); + BigDecimal norate0 = new BigDecimal(last.getNoOkQuality()).multiply(new BigDecimal(100)) + .divide(new BigDecimal(last.getQuality()), 2, RoundingMode.HALF_UP); + dataLine0.add(norate0.toString()); + } else { + dataBar0.add("0"); + dataLine0.add("0.00"); + } + } + List dataBar1 = new ArrayList<>();//不合规数量 List dataLine1 = new ArrayList<>();//不合格率 - dataBar0.add("4");dataBar0.add("9");dataBar0.add("7");dataBar0.add("13");dataBar0.add("11");dataBar0.add("7"); - dataBar0.add("8");dataBar0.add("4");dataBar0.add("5");dataBar0.add("2");dataBar0.add("10");dataBar0.add("6"); - dataBar1.add("3");dataBar1.add("14");dataBar1.add("17");dataBar1.add("3");dataBar1.add("9");dataBar1.add("3"); - dataBar1.add("8");dataBar1.add("5");dataBar1.add("4");dataBar1.add("2");dataBar1.add("9");dataBar1.add("5"); - - dataLine0.add("1");dataLine0.add("2");dataLine0.add("0.5");dataLine0.add("0.9");dataLine0.add("1");dataLine0.add("1.9"); - dataLine0.add("1.1");dataLine0.add("1");dataLine0.add("0.7");dataLine0.add("0.9");dataLine0.add("1.5");dataLine0.add("1.3"); - dataLine1.add("0.5");dataLine1.add("1.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("0.7");dataLine1.add("1.9"); - dataLine1.add("1.4");dataLine1.add("0.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("1.3");dataLine1.add("1.2"); - /**质量看板测试结束**/ + for (String day1 : daystr1) { + QcInterface now = noOkNum.get(day1); + if (now != null) { + dataBar1.add(now.getNoOkQuality()); + BigDecimal norate0 = new BigDecimal(now.getNoOkQuality()).multiply(new BigDecimal(100)) + .divide(new BigDecimal(now.getQuality()), 2, RoundingMode.HALF_UP); + dataLine1.add(norate0.toString()); + } else { + dataBar1.add("0"); + dataLine1.add("0.00"); + } + } +// /**质量看板测试开始**/ +// List dataBar0 = new ArrayList<>();//不合规数量 +// List dataLine0 = new ArrayList<>();//不合格率 +// List dataBar1 = new ArrayList<>();//不合规数量 +// List dataLine1 = new ArrayList<>();//不合格率 +// dataBar0.add("4");dataBar0.add("9");dataBar0.add("7");dataBar0.add("13");dataBar0.add("11");dataBar0.add("7"); +// dataBar0.add("8");dataBar0.add("4");dataBar0.add("5");dataBar0.add("2");dataBar0.add("10");dataBar0.add("6"); +// dataBar1.add("3");dataBar1.add("14");dataBar1.add("17");dataBar1.add("3");dataBar1.add("9");dataBar1.add("3"); +// dataBar1.add("8");dataBar1.add("5");dataBar1.add("4");dataBar1.add("2");dataBar1.add("9");dataBar1.add("5"); +// +// dataLine0.add("1");dataLine0.add("2");dataLine0.add("0.5");dataLine0.add("0.9");dataLine0.add("1");dataLine0.add("1.9"); +// dataLine0.add("1.1");dataLine0.add("1");dataLine0.add("0.7");dataLine0.add("0.9");dataLine0.add("1.5");dataLine0.add("1.3"); +// dataLine1.add("0.5");dataLine1.add("1.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("0.7");dataLine1.add("1.9"); +// dataLine1.add("1.4");dataLine1.add("0.5");dataLine1.add("0.9");dataLine1.add("1");dataLine1.add("1.3");dataLine1.add("1.2"); +// /**质量看板测试结束**/ lastYM.setDataBarArrays(dataBar0); lastYM.setDataLineArrays(dataLine0); diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml index 5cba2bec..0f334024 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml @@ -40,6 +40,7 @@ +