液碱变了

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

@@ -67,7 +67,7 @@ public class ProduceDataServiceImpl extends BaseServiceImpl<ProduceDataMapper, P
                 "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_电","dl_天然气_hy","dl_蒸汽_hy","dl_河水","dl_污水");
+                "ck_0100261","ck_0100086","ck_0100075","dl_电","dl_天然气_hy","dl_蒸汽_hy","dl_河水","dl_污水");
         Weekend<ProduceData> weekend = new Weekend<>(ProduceData.class);
         WeekendCriteria<ProduceData, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andIn(ProduceData::getNo, nos);;
@@ -100,7 +100,7 @@ public class ProduceDataServiceImpl extends BaseServiceImpl<ProduceDataMapper, P
                 "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_电","dl_天然气_hy","dl_蒸汽_hy","dl_河水","dl_污水");
+                "ck_0100261","ck_0100086","ck_0100075","dl_电","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

@@ -352,7 +352,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateRk(date, "0100010");// CM47B
         generateRk(date, "0100065");//氟化氢
         generateRk(date, "0100120");// 硫酰氯(合成)
-        generateRk(date, "0100160");//液碱32%
+        generateRk(date, "0100261");//液碱50%
         generateRk(date, "0100086");//盐酸
         generateRk(date, "0100075");//氢氧化钠(工业级片碱)
 
@@ -366,7 +366,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateCk(date, "0100010", sclList);// CM47B
         generateCk(date, "0100065", sclList);//氟化氢
         generateCk(date, "0100120", sclList);// 硫酰氯(合成)
-        generateCk(date, "0100160", sclList);//液碱32%
+        generateCk(date, "0100261", sclList);//液碱32%
         generateCk(date, "0100086", sclList);//盐酸
         generateCk(date, "0100075", sclList);//氢氧化钠(工业级片碱)，这个是从库存出库获取
 
@@ -380,7 +380,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateStockXCL(date, "0100010");// CM47B
         generateStockXCL(date, "0100065");//氟化氢
         generateStockXCL(date, "0100120");// 硫酰氯(合成)
-        generateStockXCL(date, "0100160");//液碱32%
+        generateStockXCL(date, "0100261");//液碱32%
         generateStockXCL(date, "0100086");//盐酸
         generateStockXCL(date, "0100075");//氢氧化钠(工业级片碱)，这个是手工录入，不计算
 
@@ -622,7 +622,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateYeweiReport(date, "ck_", "0100010_hy", SysConfigEnum.PRODUCE_YEWEI_CM47B_HY.name());// CM47B
         generateYeweiReport(date, "ck_", "0100065_hy", SysConfigEnum.PRODUCE_YEWEI_QFS_HY.name());// 氢氟酸
         generateYeweiReport(date, "ck_", "0100120_hy", SysConfigEnum.PRODUCE_YEWEI_LXL_HY.name());// 硫酰氯
-        generateYeweiReport(date, "ck_", "0100160_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
+        generateYeweiReport(date, "ck_", "0100261_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
         generateYeweiReport(date, "ck_", "0100086_hy", SysConfigEnum.PRODUCE_YEWEI_YS_HY.name());// 盐酸
 
         // 库存量=当日液位
@@ -633,7 +633,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateYWLStock(date, "ck_", "0100010_hy", SysConfigEnum.PRODUCE_YEWEI_CM47B_HY.name());// CM47B
         generateYWLStock(date, "ck_", "0100065_hy", SysConfigEnum.PRODUCE_YEWEI_QFS_HY.name());// 氢氟酸
         generateYWLStock(date, "ck_", "0100120_hy", SysConfigEnum.PRODUCE_YEWEI_LXL_HY.name());// 硫酰氯
-        generateYWLStock(date, "ck_", "0100160_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
+        generateYWLStock(date, "ck_", "0100261_hy", SysConfigEnum.PRODUCE_YEWEI_YJ_HY.name());// 液碱
         generateYWLStock(date, "ck_", "0100086_hy", SysConfigEnum.PRODUCE_YEWEI_YS_HY.name());// 盐酸
 
         // 单独计算904：月均单耗 = 本月耗用/CS-977月累计产量
@@ -648,7 +648,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         generateHyAgain(date, "ck_", "0100010_hy");// CM47B,902
         generateHyAgain(date, "ck_", "0100065_hy");// 氢氟酸,902
         generateHyAgain(date, "ck_", "0100120_hy");// 硫酰氯,902
-        generateHyAgain(date, "ck_", "0100160_hy");// 液碱,902
+        generateHyAgain(date, "ck_", "0100261_hy");// 液碱,902
         generateHyAgain(date, "ck_", "0100086_hy");// 盐酸,902
 
         // 重新计算977的库存，直接从液位里面取得
@@ -796,7 +796,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         // 默认977
         String sclNo = "scl_0300027";
         BigDecimal rate = new BigDecimal(1);
-        if (no.equals("0100010_hy") || no.equals("0100065_hy") || no.equals("0100120_hy") || no.equals("0100160_hy") || no.equals("0100086_hy")) {
+        if (no.equals("0100010_hy") || no.equals("0100065_hy") || no.equals("0100120_hy") || no.equals("0100261_hy") || no.equals("0100086_hy")) {
             sclNo = "scl_0600032";// 902
             rate = new BigDecimal(1);
         }
@@ -1743,7 +1743,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     vo.setLxlId(produceReportVO.getId());
                     vo.setLxlNo(produceReportVO.getNo());
                     vo.setLxlDataId(produceReportVO.getDataId());
-                } else if (produceReportVO.getNo().equals("ck_0100160")) {
+                } else if (produceReportVO.getNo().equals("ck_0100261")) {
                     vo.setYj(produceReportVO.getValue());
                     vo.setYjId(produceReportVO.getId());
                     vo.setYjNo(produceReportVO.getNo());
@@ -1920,7 +1920,7 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
                     vo.setLxlId(produceReportVO.getId());
                     vo.setLxlNo(produceReportVO.getNo());
                     vo.setLxlDataId(produceReportVO.getDataId());
-                } else if (produceReportVO.getNo().equals("ck_0100160")) {
+                } else if (produceReportVO.getNo().equals("ck_0100261")) {
                     vo.setYj(produceReportVO.getValue());
                     vo.setYjId(produceReportVO.getId());
                     vo.setYjNo(produceReportVO.getNo());