Merge remote-tracking branch 'origin/master'

2 months ago · 4152a51a9d
parent 9529c14ba7 16fbc0eeff
commit 4152a51a9d
1 changed files with 1 additions and 1 deletions
--- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java
@ -109,7 +109,7 @@ public class MesReportWorkController extends BaseController {
 //			String dateEndStr = dtf.format(dateEnd)+" 00:00:00";
 //			mesReportWork.setCreateTimeEnd(dateEndStr);//end
 //		}
-		List<MesReportWork> list = mesReportWorkService.getReportWorkHzList(mesReportWork);
+		List<MesReportWork> list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork);
 		for(MesReportWork dto:list){
 			if("1".equals(dto.getUploadStatus())){
 				dto.setUploadStatus("sap报工成功");