生产报表

platform-dao/src/main/java/com/platform/dao/vo/query/produce/ProduceReportTianVO.java

@@ -18,6 +18,175 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class ProduceReportTianVO extends BaseVO implements Serializable {
+    /**
+     * scl_0600032_yjh
+     */
+    private String yjh902;
+    /**
+     * 902
+     */
+    private String yjh902No;
+    /**
+     * 902-reportId
+     */
+    private String yjh902Id;
+    /**
+     * 902-dataId
+     */
+    private String yjh902DataId;
+
+    /**
+     * cs977
+     */
+    private String yjh977;
+    /**
+     * cs977
+     */
+    private String yjh977No;
+    /**
+     * cs977-reportId
+     */
+    private String yjh977Id;
+    /**
+     * cs977-dataId
+     */
+    private String yjh977DataId;
+
+    /**
+     * 销量：cs977
+     */
+    private String yjh977Xl;
+    /**
+     * 销量：cs977
+     */
+    private String yjh977XlNo;
+    /**
+     * 销量：cs977-reportId
+     */
+    private String yjh977XlId;
+    /**
+     * 销量：cs977-dataId
+     */
+    private String yjh977XlDataId;
+
+    /**
+     * 氯化钠xiaoshou_lhn
+     */
+    private String lhn;
+    /**
+     * 氯化钠xiaoshou_lhn
+     */
+    private String lhnNo;
+    /**
+     * 氯化钠xiaoshou_lhn-reportId
+     */
+    private String lhnId;
+    /**
+     * 氯化钠xiaoshou_lhn02-dataId
+     */
+    private String lhnDataId;
+    /**
+     * 氯化钠xiaoshou_lhn
+     */
+    private String lhnYjh;
+    /**
+     * 氯化钠xiaoshou_lhn
+     */
+    private String lhnYjhNo;
+    /**
+     * 氯化钠xiaoshou_lhn-reportId
+     */
+    private String lhnYjhId;
+    /**
+     * 氯化钠xiaoshou_lhn02-dataId
+     */
+    private String lhnYjhDataId;
+
+
+    /**
+     * 锂渣xiaoshou_0300083
+     */
+    private String lz;
+    /**
+     * 锂渣xiaoshou_0300083
+     */
+    private String lzNo;
+    /**
+     * 锂渣xiaoshou_0300083-reportId
+     */
+    private String lzId;
+    /**
+     * 锂渣xiaoshou_0300083-dataId
+     */
+    private String lzDataId;
+
+    /**
+     * 锂渣月计划
+     */
+    private String lzYjh;
+    /**
+     * 锂渣月计划
+     */
+    private String lzYjhNo;
+    /**
+     * 锂渣月计划-reportId
+     */
+    private String lzYjhId;
+    /**
+     * 锂渣月计划-dataId
+     */
+    private String lzYjhDataId;
+
+    /**
+     * 氟化鈉月计划
+     */
+    private String fhnYjh;
+    /**
+     * 氟化鈉月计划
+     */
+    private String fhnYjhNo;
+    /**
+     * 氟化鈉月计划-reportId
+     */
+    private String fhnYjhId;
+    /**
+     * 氟化鈉月计划-dataId
+     */
+    private String fhnYjhDataId;
+
+    /**
+     * 库存氯化钠stock_lhn
+     */
+    private String stockLhn;
+    /**
+     * 库存氯化钠
+     */
+    private String stockLhnNo;
+    /**
+     * 库存氯化钠-reportId
+     */
+    private String stockLhnId;
+    /**
+     * 库存氯化钠-dataId
+     */
+    private String stockLhnDataId;
+
+    /**
+     * 库存锂渣stock_0300083
+     */
+    private String stockLz;
+    /**
+     * 库存锂渣
+     */
+    private String stockLzNo;
+    /**
+     * 库存锂渣-reportId
+     */
+    private String stockLzId;
+    /**
+     * 库存锂渣-dataId
+     */
+    private String stockLzDataId;
 
     /**
      * gs902

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

@@ -84,10 +84,17 @@ public class ProduceDataServiceImpl extends BaseServiceImpl<ProduceDataMapper, P
      * 氢氧化钠(工业级片碱)  100075
      */
     // 加：天然气，蒸汽，河水，污水
+    // 加：销售/出货量，当日销量和月计划销售，氯化钠xiaoshou_lhn，锂渣xiaoshou_0300083
+    // 加：
     @Override
     public List<ProduceData> selectByDayPrefix(){
-        List<String> nos = Arrays.asList("ck_0600032","ck_0100087","ck_0100074","ck_0100083","ck_0100003","ck_0100026","ck_0100010","ck_0100065","ck_0100120",
-                "ck_0100160","ck_0100086","ck_0100075","dl_电","dl_天然气_hy","dl_蒸汽_hy","dl_河水","dl_污水");
+        List<String> nos = Arrays.asList("scl_0600032_yjh","scl_0300027_yjh",
+                "xiaoshou_0300027_yjh",
+                "xiaoshou_lhn","xiaoshou_lhn_yjh",
+                "xiaoshou_0300083","xiaoshou_0300083_yjh","xiaoshou_0300073_yjh",
+                "stock_lhn","stock_0300083",
+                "ck_0600032","ck_0100087","ck_0100074","ck_0100083","ck_0100003","ck_0100026","ck_0100010","ck_0100065","ck_0100120",
+                "ck_0100160","ck_0100086","ck_0100075","dl_电_hy","dl_天然气_hy","dl_蒸汽_hy","dl_河水","dl_污水");
         Weekend<ProduceData> weekend = new Weekend<>(ProduceData.class);
         WeekendCriteria<ProduceData, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(ProduceData::getNo, nos);;

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

@@ -197,7 +197,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             if (!CollectionUtils.isEmpty(reportList)) {
                 mapper.insertListforComplex(reportList);
             }
-        } else if (model.getNo().equals("dl_天然气_hy") || model.getNo().equals("dl_蒸汽_hy") || model.getNo().equals("dl_污水") || model.getNo().equals("dl_河水")) {
+        } else if (model.getNo().equals("dl_电_hy") ||model.getNo().equals("dl_天然气_hy") || model.getNo().equals("dl_蒸汽_hy") || model.getNo().equals("dl_污水") || model.getNo().equals("dl_河水")) {
             // 当日耗用，自动计算：本月耗用，本年耗用
             // 本年耗用：更新
             ProduceData yearData = produceDataService.selectByNo(model.getNo() + "_year");
@@ -1201,7 +1201,57 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             vo.setMonth(date.getMonthValue());
             vo.setYear(date.getYear());
             for (ProduceReportVO produceReportVO : entry.getValue()) {
-                if (produceReportVO.getNo().equals("ck_0600032")) {
+                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());
@@ -1305,7 +1355,136 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
      */
     @Override
     public void updateByDay(ProduceReportTianVO produceReportTianVO) {
-
+        // 902 scl_0600032_yjh
+        if (StringUtils.isNotBlank(produceReportTianVO.getYjh902())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getYjh902Id());
+            model.setDataId(produceReportTianVO.getYjh902DataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getYjh902No());
+            model.setValue(produceReportTianVO.getYjh902());
+            this.modModelByDTO(model);
+        }
+        // yjh977
+        if (StringUtils.isNotBlank(produceReportTianVO.getYjh977())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getYjh977Id());
+            model.setDataId(produceReportTianVO.getYjh977DataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getYjh977No());
+            model.setValue(produceReportTianVO.getYjh977());
+            this.modModelByDTO(model);
+        }
+        // 销量：cs977
+        if (StringUtils.isNotBlank(produceReportTianVO.getYjh977Xl())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getYjh977XlId());
+            model.setDataId(produceReportTianVO.getYjh977XlDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getYjh977XlNo());
+            model.setValue(produceReportTianVO.getYjh977Xl());
+            this.modModelByDTO(model);
+        }
+        // 902 scl_0600032_yjh
+        if (StringUtils.isNotBlank(produceReportTianVO.getLhn())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getLhnId());
+            model.setDataId(produceReportTianVO.getLhnDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getLhnNo());
+            model.setValue(produceReportTianVO.getLhn());
+            this.modModelByDTO(model);
+        }
+        // 氯化钠xiaoshou_lhn_yjh
+        if (StringUtils.isNotBlank(produceReportTianVO.getLhnYjh())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getLhnYjhId());
+            model.setDataId(produceReportTianVO.getLhnYjhDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getLhnYjhNo());
+            model.setValue(produceReportTianVO.getLhnYjh());
+            this.modModelByDTO(model);
+        }
+        // 锂渣xiaoshou_0300083
+        if (StringUtils.isNotBlank(produceReportTianVO.getLz())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getLzId());
+            model.setDataId(produceReportTianVO.getLzDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getLzNo());
+            model.setValue(produceReportTianVO.getLz());
+            this.modModelByDTO(model);
+        }
+        // 锂渣xiaoshou_0300083_yjh
+        if (StringUtils.isNotBlank(produceReportTianVO.getLzYjh())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getLzYjhId());
+            model.setDataId(produceReportTianVO.getLzYjhDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getLzYjhNo());
+            model.setValue(produceReportTianVO.getLzYjh());
+            this.modModelByDTO(model);
+        }
+        // 氟化钠xiaoshou_0300073_yjh
+        if (StringUtils.isNotBlank(produceReportTianVO.getFhnYjh())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getFhnYjhId());
+            model.setDataId(produceReportTianVO.getFhnYjhDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getFhnYjhNo());
+            model.setValue(produceReportTianVO.getFhnYjh());
+            this.modModelByDTO(model);
+        }
+        // 库存	氯化钠stock_lhn
+        if (StringUtils.isNotBlank(produceReportTianVO.getStockLhn())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getStockLhnId());
+            model.setDataId(produceReportTianVO.getStockLhnDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getStockLhnNo());
+            model.setValue(produceReportTianVO.getStockLhn());
+            this.modModelByDTO(model);
+        }
+        // 库存	锂渣stock_0300083
+        if (StringUtils.isNotBlank(produceReportTianVO.getStockLz())) {
+            ProduceReportDTO model = new ProduceReportDTO();
+            model.setId(produceReportTianVO.getStockLzId());
+            model.setDataId(produceReportTianVO.getStockLzDataId());
+            model.setDate(produceReportTianVO.getDate());
+            model.setMonth(produceReportTianVO.getMonth());
+            model.setDay(produceReportTianVO.getDay());
+            model.setYear(produceReportTianVO.getYear());
+            model.setNo(produceReportTianVO.getStockLzNo());
+            model.setValue(produceReportTianVO.getStockLz());
+            this.modModelByDTO(model);
+        }
         // 天然气
         if (StringUtils.isNotBlank(produceReportTianVO.getGasNo())) {
             ProduceReportDTO model = new ProduceReportDTO();
@@ -1322,7 +1501,6 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         // 蒸汽
         if (StringUtils.isNotBlank(produceReportTianVO.getSteamNo())) {
             ProduceReportDTO model = new ProduceReportDTO();
-            model = new ProduceReportDTO();
             model.setId(produceReportTianVO.getSteamId());
             model.setDataId(produceReportTianVO.getSteamDataId());
             model.setDate(produceReportTianVO.getDate());
@@ -1336,7 +1514,6 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         // 河水
         if (StringUtils.isNotBlank(produceReportTianVO.getRiverWaterNo())) {
             ProduceReportDTO model = new ProduceReportDTO();
-            model = new ProduceReportDTO();
             model.setId(produceReportTianVO.getRiverWaterId());
             model.setDataId(produceReportTianVO.getRiverWaterDataId());
             model.setDate(produceReportTianVO.getDate());
@@ -1350,7 +1527,6 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         // 污水
         if (StringUtils.isNotBlank(produceReportTianVO.getSewageNo())) {
             ProduceReportDTO model = new ProduceReportDTO();
-            model = new ProduceReportDTO();
             model.setId(produceReportTianVO.getSewageId());
             model.setDataId(produceReportTianVO.getSewageDataId());
             model.setDate(produceReportTianVO.getDate());