Prechádzať zdrojové kódy

原材料消耗,产品产量实绩 重新生成

QuietShadow 2 rokov pred
rodič
commit
547505b042

+ 5 - 0
src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -254,6 +254,11 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
 			TRmWorkprocMaterial t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
+        //region 2022-07-13 张琰。
+        //根据报表中的产量数据生成
+        //tRmWorkprocMaterialValueService.getReportValue(parmas);
+        tRmWorkprocMaterialValueService.getMaterialValue(parmas);
+        //endregion
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}

+ 1 - 1
src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/impl/TRmWorkprocMaterialValueServiceImpl.java

@@ -771,6 +771,7 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
 			hs.put("clocke", dateForm.format(calendar.getTime()));
 			//根据报表中的产量数据生成
 			hs.put("useflag", "1");
+			//this.getReportValue(hs);
 			this.getMaterialValue(hs);
 			//endregion
     	calendar.setTime(date);
@@ -1084,7 +1085,6 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
 		HashMap<String, Object> m = new HashMap<String, Object>();
 		m.put("clock", today);
 		m.put("clock1",yesterday);
-		tRmWorkprocMaterialValueMapper.getReportValue(m);
 		List<TRmWorkprocMaterialValue> trmlist= tRmWorkprocMaterialValueMapper.getReportValue(m);
 		TRmWorkprocMaterialValue trmModel=new TRmWorkprocMaterialValue();
 		for(TRmWorkprocMaterialValue trmWorkprocMaterialValue: trmlist)

+ 5 - 0
src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -439,6 +439,11 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
 			TRmWorkprocProduct t = l.get(i);
 			res = formulaService.reItemVal(t.getItemid(),clock,timegranid,clocke);
 		}
+        //region 2022-07-13 张琰。
+        //根据报表中的产量数据生成
+        tRmWorkprocProductValueService.getReportValue(parmas);
+        tRmWorkprocProductValueService.getReportProductValue(parmas);
+        //endregion
 		if(!res.isEmpty()){
 			return failed(null, res);
 		}