Merge branch 'master' of https://git.steerinfo.com/XTEMS/xt-ems-api

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

@@ -180,7 +180,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     productid="发电量";
                     unit="006";
                     // 发电厂合计
-                    workProcid = "AT1006";
+                    //workProcid = "AT1006";
                     break;
                 case "JCS" :
                     sumWeight = model.getWeight().intValue();
@@ -266,7 +266,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                 if(monList.size()<=0){
                     EmsProdplanMonth emsProdplanMonth = emsProdplanMonthService.add(monModel);
                 } else {
-                    if((model.getParentid().equals("LG") && monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ") || model.getParentid().equals("FDC")) {
+                    if((model.getParentid().equals("LG") && monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ")) {
+                         //|| model.getParentid().equals("FDC")
                         monModel.setKxf_weight(monList.get(0).getKxf_weight().add(monModel.getKxf_weight()));
                         monModel.setWeightMonth(monList.get(0).getWeightMonth().add(monModel.getWeightMonth()));
                         monModel.setWeightDay(monList.get(0).getWeightDay().add(monModel.getWeightDay()));
@@ -413,7 +414,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                     sumWeight = model.getWeight().intValue();
                     productid="发电量";
                     // 发电厂合计
-                    workProcid = "AT1006";
+                    //workProcid = "AT1006";
                     unit="006";
                     break;
                 case "JCS" :
@@ -505,7 +506,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
                 if(monList.size()<=0){
                         emsProdplanMonthService.add(monModel);
                 } else {
-                    if((model.getParentid().equals("LG")&&monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ") || model.getParentid().equals("FDC")) {
+                    if((model.getParentid().equals("LG")&&monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ")) {
+                         //|| model.getParentid().equals("FDC")
                         if (i == 0){
                             monList.get(0).setWeightMonth(BigDecimal.valueOf(0));
                             monList.get(0).setWeightDay(BigDecimal.valueOf(0));

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -810,8 +810,8 @@ FROM
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,ZH_RCL2 AS ACTUALVALUE,ZH_RCL2 AS APPORTVALUE,'AT3012CP010R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND ZH_RCL2 IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,KZF_RCL AS ACTUALVALUE,KZF_RCL AS APPORTVALUE,'AT2014CP048R' AS ITEMID FROM EMS_SCQK_JC WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND KZF_RCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,RCL AS ACTUALVALUE,(100-0)/100*RCL AS APPORTVALUE,'AT2017CP040R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND RCL IS NOT NULL UNION ALL
-    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT2011CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
-    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT2011CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,JY_CL AS ACTUALVALUE,JY_CL AS APPORTVALUE,'AT3024CP032R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JY_CL IS NOT NULL UNION ALL
+    SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,CB_CL AS ACTUALVALUE,CB_CL AS APPORTVALUE,'AT3009CP026R' AS ITEMID FROM EMS_SCQK_JJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND CB_CL IS NOT NULL UNION ALL
     SELECT TO_CHAR( DATES, 'yyyy-MM-dd' ) AS CLOCK,JMCL AS ACTUALVALUE,JMCL AS APPORTVALUE,'AT2012CP031R' AS ITEMID FROM EMS_SCQK_JJ WHERE
  TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND JMCL IS NOT NULL UNION ALL
     SELECT TO_CHAR(DATES,'yyyy-MM-dd') AS CLOCK,YS_CL AS ACTUALVALUE,YS_CL AS APPORTVALUE,'AT2009CP022R' AS ITEMID FROM EMS_SCQK_SJ WHERE TO_CHAR(DATES,'yyyy-MM-dd')>=#{clock,jdbcType=VARCHAR} AND TO_CHAR(DATES,'yyyy-MM-dd')<=#{clocke,jdbcType=VARCHAR} AND YS_CL IS NOT NULL UNION ALL