报工备注

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -268,12 +268,12 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateBy(updateBy);
 		}
         //统一备注
-        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
-		if(!CollectionUtils.isEmpty(remarks)){
+//        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
+//		if(!CollectionUtils.isEmpty(remarks)){
 			for(MesReportWork mesReportWork:mesReportWorks){
-				mesReportWork.setRemark(remarks.get(0));
+				mesReportWork.setRemark(mesReportWorks.get(0).getRemark());
 			}
-		}
+//		}
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}