Merge remote-tracking branch 'origin/master'

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

@@ -246,15 +246,20 @@ public class MesMaterialReportController extends BaseController {
 			resp.setMessage("来料码不能为空！");
 			return resp;
 		}
+		if (materialCode.contains(" ")) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("来料码不能包含空格！");
+			return resp;
+		}
 		materialCode = materialCode.trim();
-		String[] parts = materialCode.split(",", -1);
+		String[] parts = materialCode.split(",");
 		if (parts.length != 7) {
 			resp.setResult(Global.FALSE);
 			resp.setMessage("二维码规则不正确！");
 			return resp;
 		}
 		// 供应商代码,采购订单号,采购订单行号,erp编码,生产日期,生产批次,批次数量
-		String erpSn = parts[3].trim();
+		String erpSn = parts[3];
 		String faDate = parts[4].trim();
 		String faNums = parts[6].trim();
 		if (StringUtils.isEmpty(erpSn) || StringUtils.isEmpty(faDate) || StringUtils.isEmpty(faNums)

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

@@ -2879,13 +2879,37 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 		}
 
 		try{
-
-			String res = updateQualityCommon(mesLineProcess1,oprno,lineSn,sn,craft,result,userCode,params,remark);
-			String checkret = res.substring(2,4);
-			if(!checkret.equals("OK")){
-				String lx = res.substring(0,2)+" ";
-				String lmsg = ErrorMsg.getErrorMsg(checkret,lx);
-				return renderResult(Global.FALSE, text(lmsg));
+			// OP310提交OK时，同步将OP310/OP320/OP330/OP340/OP350工位结果都提交为OK
+			if("OP310".equals(CommonUitl.formatOprno(oprno)) && "OK".equals(result)){
+				String[] relatedOprnos = new String[]{"OP310", "OP320", "OP330", "OP340", "OP350"};
+				for(String relatedOprno : relatedOprnos){
+					MesLineProcess mlp = "OP310".equals(relatedOprno)
+							? mesLineProcess1
+							: mesLineProcessService.findInfoByOprnoLineSn(relatedOprno, lineSn);
+					if(ObjectUtils.isEmpty(mlp)){
+						return renderResult(Global.FALSE, text(relatedOprno + "子工位未配置！"));
+					}
+					// OP320-OP350提交前检查模板，缺失则补建
+					if(!"OP310".equals(relatedOprno)){
+						checkTempalte(sn, relatedOprno, lineSn);
+					}
+					String res = updateQualityCommon(mlp, relatedOprno, lineSn, sn, craft, "OK", userCode, params,
+							"OP310".equals(relatedOprno) ? remark : null);
+					String checkret = res.substring(2,4);
+					if(!checkret.equals("OK")){
+						String lx = res.substring(0,2)+" ";
+						String lmsg = ErrorMsg.getErrorMsg(checkret,lx);
+						return renderResult(Global.FALSE, text(lmsg));
+					}
+				}
+			}else{
+				String res = updateQualityCommon(mesLineProcess1,oprno,lineSn,sn,craft,result,userCode,params,remark);
+				String checkret = res.substring(2,4);
+				if(!checkret.equals("OK")){
+					String lx = res.substring(0,2)+" ";
+					String lmsg = ErrorMsg.getErrorMsg(checkret,lx);
+					return renderResult(Global.FALSE, text(lmsg));
+				}
 			}
 		}catch (Exception e){
 			e.printStackTrace();