lrl -2021-12-19

src/main/java/com/steerinfo/ems/emsprodplanyear/controller/EmsProdplanYearController.java

@@ -147,7 +147,10 @@ public class EmsProdplanYearController extends BaseRESTfulController {
             switch (model.getParentid()) {
                 case "LG":
                     sumWeight = model.getWeight().intValue();
-                    productid="钢坯";
+                    productid="方坯";
+                    if (model.getLine().equals("AT2007")){
+                        productid="异型坯";
+                    }
                     unit="008";
                     workProcid = "AT2004";
                     break;
@@ -176,7 +179,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     break;
                 case "JCS" :
                     sumWeight = model.getWeight().intValue();
-                    productid="白灰";
+                    productid="白灰粉";
                     unit="008";
                     break;
                 case "JCW" :
@@ -193,9 +196,12 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     break;
                 case "JJF" :
                     sumWeight = model.getWeight().intValue();
-                    productid="焦油";
-                    if(model.getLine().equals("AT3009")){
-                        productid="粗苯";
+                    if(model.getLine().equals("AT2011")) {
+                        productid = "粗苯";
+                    }
+                    if (model.getLine().equals("AT3024")){
+                        productid="焦油";
+                        model.setLine("AT2011");
                     }
                     if(model.getLine().equals("AT3010")){
                         productid="硫铵";

src/main/java/com/steerinfo/task/SpringCronTask.java

@@ -355,10 +355,10 @@ public class SpringCronTask implements SchedulingConfigurer{
 					 }
 					 logger.info("定时任务"+taskId+"执行时长：" + (System.currentTimeMillis() - start)/1000 + "秒");
 				 }
-				  else if(taskId.equalsIgnoreCase("128")){
+				else if(taskId.equalsIgnoreCase("128")){
 					 long start = System.currentTimeMillis();
 					 try {
-						 tRmCalpointValueService.getDataForBb();
+						 tRmCalpointValueService.insetDataForBb();
 					 } catch (Exception e) {
 						 e.printStackTrace();
 					 }