生产报表

platform-service/src/main/java/com/platform/service/produce/impl/ProduceReportServiceImpl.java

@@ -152,17 +152,22 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             model.setYear(date.getYear());
             model.setMonth(date.getMonthValue());
             model.setDay(date.getDayOfMonth());
+            super.modModelByDTO(model);
+            /*LocalDate date = model.getDate();
+            model.setYear(date.getYear());
+            model.setMonth(date.getMonthValue());
+            model.setDay(date.getDayOfMonth());
             ProduceData produceData = produceDataService.getModelById(model.getDataId());
             Weekend<ProduceReport> weekend = new Weekend<>(ProduceReport.class);
             WeekendCriteria<ProduceReport, Object> weekendCriteria = weekend.weekendCriteria();
             weekendCriteria.andEqualTo(ProduceReport::getDataId, produceData.getId())
                     .andEqualTo(ProduceReport::getYear, date.getYear())
                     .andEqualTo(ProduceReport::getMonth, date.getMonthValue());
-            mapper.deleteByExample(weekend);
+            mapper.deleteByExample(weekend);*/
 
-            // 新增这一个月的数据
-            List<ProduceReport> reportList = new ArrayList<>();
-            ProduceData wcl = produceDataService.selectByNo(model.getNo() + "_wcl");
+            // 新增这一个月的月计划数据
+            /*List<ProduceReport> reportList = new ArrayList<>();
+            ProduceData wcl = produceDataService.selectByNo(model.getNo() + "_yjh");
             for (int i = 1; i <= date.lengthOfMonth(); i++) {
                 ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
                 report.setYear(date.getYear());
@@ -191,12 +196,12 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     monthReport.setValue("0");
                     reportList.add(monthReport);
                 }
-            }
+            }*/
 
             // 重新计算这一个月的数据和完成率
-            if (!CollectionUtils.isEmpty(reportList)) {
+            /*if (!CollectionUtils.isEmpty(reportList)) {
                 mapper.insertListforComplex(reportList);
-            }
+            }*/
         } else if (model.getNo().equals("xiaoshou_lhn")
                 || model.getNo().equals("xiaoshou_0300083")
                 || model.getNo().equals("dl_电_hy")
@@ -400,10 +405,14 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         find.setType(ProduceRecordTypeEnum.DIAN.getValue());
         ProduceRecord produceRecord = produceRecordService.getModelByModel(find);
 
-
         String prefix = "dl_";
         String no = "电";
 
+        // 防止没数据
+        if (produceRecord == null) {
+            produceRecord = new ProduceRecord();
+            produceRecord.setNum(new BigDecimal(0));
+        }
         // 当日数据
         ProduceData produceData = produceDataService.selectByNo(prefix + no);
         ProduceReport report = BeanConverterUtil.copyObjectProperties(produceData, ProduceReport.class);
@@ -1145,7 +1154,122 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             vo.setMonth(date.getMonthValue());
             vo.setYear(date.getYear());
             for (ProduceReportVO produceReportVO : entry.getValue()) {
-                if (produceReportVO.getNo().equals("dl_天然气_hy")) {
+                if (produceReportVO.getNo().equals("scl_0600032_yjh")) {// 生产量	902	月计划产量
+                    vo.setYjh902(produceReportVO.getValue());
+                    vo.setYjh902Id(produceReportVO.getId());
+                    vo.setYjh902No(produceReportVO.getNo());
+                    vo.setYjh902DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("scl_0300027_yjh")) {// CS-977	月计划产量	scl_0300027_yjh
+                    vo.setYjh977(produceReportVO.getValue());
+                    vo.setYjh977Id(produceReportVO.getId());
+                    vo.setYjh977No(produceReportVO.getNo());
+                    vo.setYjh977DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_0300027_yjh")) {// 销售/出货量	CS-977	月计划销售
+                    vo.setYjh977Xl(produceReportVO.getValue());
+                    vo.setYjh977XlId(produceReportVO.getId());
+                    vo.setYjh977XlNo(produceReportVO.getNo());
+                    vo.setYjh977XlDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_lhn")) {// 销售/出货量	氯化钠	当日销量xiaoshou_lhn
+                    vo.setLhn(produceReportVO.getValue());
+                    vo.setLhnId(produceReportVO.getId());
+                    vo.setLhnNo(produceReportVO.getNo());
+                    vo.setLhnDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_lhn_yjh")) {// 销售/出货量	氯化钠	月计划销售	xiaoshou_lhn_yjh
+                    vo.setLhnYjh(produceReportVO.getValue());
+                    vo.setLhnYjhId(produceReportVO.getId());
+                    vo.setLhnYjhNo(produceReportVO.getNo());
+                    vo.setLhnYjhDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_0300083")) {// 	销售/出货量	锂渣	当日销量	xiaoshou_0300083
+                    vo.setLz(produceReportVO.getValue());
+                    vo.setLzId(produceReportVO.getId());
+                    vo.setLzNo(produceReportVO.getNo());
+                    vo.setLzDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_0300083_yjh")) {// 销售/出货量	锂渣	月计划销售	xiaoshou_0300083_yjh
+                    vo.setLzYjh(produceReportVO.getValue());
+                    vo.setLzYjhId(produceReportVO.getId());
+                    vo.setLzYjhNo(produceReportVO.getNo());
+                    vo.setLzYjhDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("xiaoshou_0300073_yjh")) {// 	销售/出货量	氟化钠	月计划销售	xiaoshou_0300073_yjh
+                    vo.setFhnYjh(produceReportVO.getValue());
+                    vo.setFhnYjhId(produceReportVO.getId());
+                    vo.setFhnYjhNo(produceReportVO.getNo());
+                    vo.setFhnYjhDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("stock_lhn")) {//库存 	氯化钠	氯化钠	stock_lhn
+                    vo.setStockLhn(produceReportVO.getValue());
+                    vo.setStockLhnId(produceReportVO.getId());
+                    vo.setStockLhnNo(produceReportVO.getNo());
+                    vo.setStockLhnDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("stock_0300083")) {//库存	锂渣	锂渣	stock_0300083
+                    vo.setStockLz(produceReportVO.getValue());
+                    vo.setStockLzId(produceReportVO.getId());
+                    vo.setStockLzNo(produceReportVO.getNo());
+                    vo.setStockLzDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0600032")) {
+                    vo.setGs902(produceReportVO.getValue());
+                    vo.setGs902Id(produceReportVO.getId());
+                    vo.setGs902No(produceReportVO.getNo());
+                    vo.setGs902DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100087")) {
+                    vo.setGs903(produceReportVO.getValue());
+                    vo.setGs903Id(produceReportVO.getId());
+                    vo.setGs903No(produceReportVO.getNo());
+                    vo.setGs903DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100074")) {
+                    vo.setGs904(produceReportVO.getValue());
+                    vo.setGs904Id(produceReportVO.getId());
+                    vo.setGs904No(produceReportVO.getNo());
+                    vo.setGs904DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100083")) {
+                    vo.setGs905(produceReportVO.getValue());
+                    vo.setGs905Id(produceReportVO.getId());
+                    vo.setGs905No(produceReportVO.getNo());
+                    vo.setGs905DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100003")) {
+                    vo.setGs907(produceReportVO.getValue());
+                    vo.setGs907Id(produceReportVO.getId());
+                    vo.setGs907No(produceReportVO.getNo());
+                    vo.setGs907DataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100026")) {
+                    vo.setF160C(produceReportVO.getValue());
+                    vo.setF160CId(produceReportVO.getId());
+                    vo.setF160CNo(produceReportVO.getNo());
+                    vo.setF160CDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100010")) {
+                    vo.setCM47B(produceReportVO.getValue());
+                    vo.setCM47BId(produceReportVO.getId());
+                    vo.setCM47BNo(produceReportVO.getNo());
+                    vo.setCM47BDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100065")) {
+                    vo.setFhq(produceReportVO.getValue());
+                    vo.setFhqId(produceReportVO.getId());
+                    vo.setFhqNo(produceReportVO.getNo());
+                    vo.setFhqDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100120")) {
+                    vo.setLxl(produceReportVO.getValue());
+                    vo.setLxlId(produceReportVO.getId());
+                    vo.setLxlNo(produceReportVO.getNo());
+                    vo.setLxlDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100160")) {
+                    vo.setYj(produceReportVO.getValue());
+                    vo.setYjId(produceReportVO.getId());
+                    vo.setYjNo(produceReportVO.getNo());
+                    vo.setYjDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100086")) {
+                    vo.setYs(produceReportVO.getValue());
+                    vo.setYsId(produceReportVO.getId());
+                    vo.setYsNo(produceReportVO.getNo());
+                    vo.setYsDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("ck_0100075")) {
+                    vo.setQyhn(produceReportVO.getValue());
+                    vo.setQyhnId(produceReportVO.getId());
+                    vo.setQyhnNo(produceReportVO.getNo());
+                    vo.setQyhnDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("dl_电")) {
+                    vo.setDian(produceReportVO.getValue());
+                    vo.setDianId(produceReportVO.getId());
+                    vo.setDianNo(produceReportVO.getNo());
+                    vo.setDianDataId(produceReportVO.getDataId());
+                } else if (produceReportVO.getNo().equals("dl_天然气_hy")) {
                     vo.setGas(produceReportVO.getValue());
                     vo.setGasId(produceReportVO.getId());
                     vo.setGasNo(produceReportVO.getNo());