Merge branch 'master' of http://121.36.46.135:3000/mes-ljz/mescloud

src/main/java/com/jeesite/modules/mes/web/MesMaterialCheckRecordController.java

@@ -158,10 +158,12 @@ public class MesMaterialCheckRecordController extends BaseController {
 		logger.info("reports:"+JSON.toJSONString(reports));
 		if(!ListUtils.isEmpty(reports)){
 			for(MesMaterialReport mesMaterialReport1:reports){
-				if(mesMaterialReport1.getState().equals("0")){
+				mesMaterialReport1.setHgQty(mesMaterialCheckRecord.getHgQty());
+				mesMaterialReport1.setBhgQty(mesMaterialCheckRecord.getBhgQty());
+				if("0".equals(mesMaterialReport1.getState())){
 					mesMaterialReport1.setState("1");
-					mesMaterialReportService.update(mesMaterialReport1);
 				}
+				mesMaterialReportService.update(mesMaterialReport1);
 			}
 		}