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

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -244,9 +244,7 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
 		tRmWorkprocMaterialValueService.synchronousData();
 		tRmWorkprocMaterialValueService.synchronousData4();
 		tRmWorkprocMaterialValueService.synchronousData5();
-        //根据报表中的原料数据生成
-        tRmWorkprocMaterialValueService.getReportValue(parmas);
-        tRmWorkprocMaterialValueService.getMaterialValue(parmas);
+
 		parmas.put("useflag", "1");
 		// 查询需要统计的计量点信息
 		List<TRmWorkprocMaterial> l = tRmWorkprocMaterialMapper.selectByParameters(parmas);
@@ -255,6 +253,9 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
 			TRmWorkprocMaterial t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
+        //根据报表中的原料数据生成
+        //tRmWorkprocMaterialValueService.getReportValue(parmas);
+        tRmWorkprocMaterialValueService.getMaterialValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -441,7 +441,7 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
         //根据报表中的产量数据生成
-        tRmWorkprocProductValueService.getReportValue(parmas);
+        //tRmWorkprocProductValueService.getReportValue(parmas);
         tRmWorkprocProductValueService.getReportProductValue(parmas);
 		if(!res.isEmpty()){
 			return failed(null, res);