zhanghe 5 tháng trước cách đây
mục cha
commit
e978689688

+ 1 - 1
src/main/java/com/jeesite/modules/mes/service/MesProductRecordService.java

@@ -686,7 +686,7 @@ public class MesProductRecordService extends CrudService<MesProductRecordDao, Me
 						mesProductRecord.setOprno(oldOprno);
 					}
 
-					if(!userCode.equals("")&&!StringUtils.isEmpty(userCode)){
+					if(!StringUtils.isEmpty(userCode)&&!userCode.equals("")){
 						mesProductRecord.setUpdateBy(userCode);
 					}
 

+ 2 - 3
src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -2395,8 +2395,8 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 		if(oldOprno.length()==5){
 			oldOprno += "A";
 		}
-		String mesRepairQuality_image = request.getParameter("mes_pdaresult_image");
-//		if(com.alibaba.druid.util.StringUtils.isEmpty(mes_pdaresult_image)){
+		String mesProductRecord_image = request.getParameter("mesProductRecord_image");
+//		if(com.alibaba.druid.util.StringUtils.isEmpty(mesProductRecord_image)){
 //			return renderResult(Global.FALSE, text("图片不能为空!"));
 //		}
 		if(StringUtils.isEmpty(sn) || StringUtils.isEmpty(oprno) || StringUtils.isEmpty(result) || StringUtils.isEmpty(lineSn)){
@@ -2420,7 +2420,6 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 		try{
 
 			String res = updateQualityCommon(mesLineProcess1,oprno,lineSn,sn,craft,result,userCode,params);
-			FileUploadUtils.saveFileUpload(mesRepair, mesRepair.getId(), "mesRepairQuality_image");//保存图片
 			String checkret = res.substring(2,4);
 			if(!checkret.equals("OK")){
 				String lx = res.substring(0,2)+" ";