优化

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

@@ -958,8 +958,11 @@ public class MesProductRecordController extends BaseController {
 		String userCode = ProtocolParam.getUserCode(msg).trim();
 
 		ret = checkQualityCommon(oldOprno,sn,lineSn,userCode);
-
-		return "RS"+ret.substring(3,5);
+		String substring = ret.substring(3, 5);
+		if (substring.equals("QD")){
+			return ret.substring(0,2)+substring;
+		}
+		return "RS"+substring;
 	}
 
 	// 查询质量公共部分
@@ -1238,10 +1241,11 @@ public class MesProductRecordController extends BaseController {
 		}else{
 			checkTempalte(sn,oprno,lineSn); // 检查模板
 		}
-
+		String productCate = mesLineService.findInfoCate(lineSn);
 		// 检查工件状态
 		MesProduct mesProduct = new MesProduct();
 		mesProduct.setSn(sn);
+		mesProduct.setCate(productCate);
 		MesProduct mesProduct2 = mesProductService.findInfo(mesProduct);
 		if(ObjectUtils.isEmpty(mesProduct2)){
 			ret = bs+"NE";
@@ -1263,6 +1267,12 @@ public class MesProductRecordController extends BaseController {
 		if(lineSn.equals("XT")){
 			passoprnos = Global.getConfig("mes.pass.oprno.xt");
 		}
+		if(lineSn.equals("MP")){
+			passoprnos = Global.getConfig("mes.pass.oprno.mp");
+		}
+		if(lineSn.equals("ZP")){
+			passoprnos = Global.getConfig("mes.pass.oprno.zp");
+		}
 
 		// 万能码逻辑
 		String universalSn = Global.getConfig("mes.universal.sn");
@@ -1572,7 +1582,6 @@ public class MesProductRecordController extends BaseController {
 				}
 			}
 
-			//320添加子工位
 
 			// 判断是否是OK/NG样件
 			MesProductSample mesProductSample = new MesProductSample();
@@ -2379,13 +2388,17 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 		String oprno = request.getParameter("oprno");
 		String lineSn = request.getParameter("lineSn");
 		String result = request.getParameter("result");
+
 		String craft = "100000";
 		String remark = request.getParameter("remark");
 		String oldOprno = oprno;
 		if(oldOprno.length()==5){
 			oldOprno += "A";
 		}
-
+		String mesRepairQuality_image = request.getParameter("mes_pdaresult_image");
+//		if(com.alibaba.druid.util.StringUtils.isEmpty(mes_pdaresult_image)){
+//			return renderResult(Global.FALSE, text("图片不能为空！"));
+//		}
 		if(StringUtils.isEmpty(sn) || StringUtils.isEmpty(oprno) || StringUtils.isEmpty(result) || StringUtils.isEmpty(lineSn)){
 			return renderResult(Global.FALSE, text("参数错误！"));
 		}
@@ -2407,6 +2420,7 @@ 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)+" ";