优化

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

@@ -511,5 +511,28 @@ public class MesLineProcessController extends BaseController {
 		return resp;
 	}
 
+	// 获取父级工位
+	@RequestMapping(value = "getParents")
+	@ResponseBody
+	public CommonResp getParents(HttpServletRequest request) {
+		CommonResp<Map<String, Object>> resp = new CommonResp<>();
+		Map<String, Object> map = MapUtils.newHashMap();
+		MesLineProcess mesLineProcess = new MesLineProcess();
+		mesLineProcess.setStatus("0");
+		mesLineProcess.setLineSn("XT");
+		String sn = request.getParameter("sn");
+		mesLineProcess.getSqlMap().getWhere().and("a.pid",QueryType.IS_NULL,"");
+		List<MesLineProcess> lists = mesLineProcessService.findList(mesLineProcess);
+		if(ListUtils.isEmpty(lists)){
+			List<MesLineProcess> list1 = new ArrayList<>();
+			map.put("lists", list1);
+		}else{
+			map.put("lists", lists);
+		}
+		resp.setData(map);
+		resp.setResult(Global.TRUE);
+		return resp;
+	}
+
 
 }

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

@@ -638,7 +638,7 @@ public class MesRepairController extends BaseController {
 			resp.setMessage("参数错误");
 			return resp;
 		}
-		oprno = mesRepairItems1.getOprno();
+//		oprno = mesRepairItems1.getOprno();
 
 		MesProductRecord mesProductRecord = new MesProductRecord();
 		mesProductRecord.setSn(sn);

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

@@ -149,10 +149,15 @@ public class MesRepairQualityController extends BaseController {
 		String sn = req.getParameter("sn");
 		String remark = req.getParameter("remark");
 		String result = req.getParameter("result");
+		String returnOprno = req.getParameter("returnOprno");
 		if(StringUtils.isEmpty(sn)){
 			resp.setMessage("参数错误");
 			return resp;
 		}
+		if(StringUtils.isEmpty(returnOprno)){
+			resp.setMessage("参数错误");
+			return resp;
+		}
 		if(!result.equals("1") && !result.equals("2")){
 			resp.setMessage("参数错误");
 			return resp;
@@ -176,7 +181,11 @@ public class MesRepairQualityController extends BaseController {
 			resp.setMessage("返修记录不存在");
 			return resp;
 		}
-		if(!mesRepair.getState().equals("2")){
+		if(mesRepair.getState().equals("1")){
+			resp.setMessage("当前工件未维修！");
+			return resp;
+		}
+		if(mesRepair.getState().equals("3")){
 			resp.setMessage("当前工件已检查！");
 			return resp;
 		}
@@ -194,6 +203,7 @@ public class MesRepairQualityController extends BaseController {
 		mesRepair.setCheckDate(new Date());
 		mesRepair.setState("3");
 		mesRepair.setResult(result);
+		mesRepair.setReturnOprno(returnOprno);
 		mesRepairService.save(mesRepair);
 
 		MesProductRecord mesProductRecord = new MesProductRecord();
@@ -208,32 +218,6 @@ public class MesRepairQualityController extends BaseController {
 		}else{
 			pp.setContent("OK");
 			mesProductRecordService.save(pp);
-
-			String repairItemId = "18565249649801748481111";
-			if(mesRepair.getItemId().equals(repairItemId)){ // 底护板更换
-				String[] qmoprnos = new String[]{"OP330","OP360","OP370","OP380","OP390","OP400","OP410"};
-				for (String op:qmoprnos){
-					// 返回工位改成UDF
-					MesProductRecord mesProductRecord2 = new MesProductRecord();
-					mesProductRecord2.setSn(mesRepair.getSn());
-					mesProductRecord2.setOprno(op);
-					mesProductRecord2.setCraft("100000");
-					MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-					if(!ObjectUtils.isEmpty(pp2) && !pp2.getContent().equals("UDF")){
-						pp2.setContent("UDF");
-						mesProductRecordService.save(pp2);
-					}
-				}
-			}else{
-				// 返回工位改成UDF
-				MesProductRecord mesProductRecord2 = new MesProductRecord();
-				mesProductRecord2.setSn(mesRepair.getSn());
-				mesProductRecord2.setOprno(mesRepair.getReturnOprno());
-				mesProductRecord2.setCraft("100000");
-				MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-				pp2.setContent("UDF");
-				mesProductRecordService.save(pp2);
-			}
 		}
 
 		if(result.equals("1")){ // 返修OK

src/main/resources/config/application.yml

@@ -59,6 +59,8 @@ jdbc:
 #  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   username: mescloud
   password: 8neywEN86NLam3ts
+#  username: mes_cloud_x13
+#  password: rzX6xKhEARFTYdpy
 #  username: root
 #  password: 123456
 #
@@ -896,7 +898,7 @@ file:
 
 #  # 文件上传根路径，设置路径中不允许包含“userfiles”，在指定目录中系统会自动创建userfiles目录，如果不设置默认为contextPath路径
   baseDir: D:/mescloud
-#  baseDir: /www/wwwroot/mes_cloud_dy
+#  baseDir: /www/wwwroot/mes_cloud_x13
 #
 #  # 上传文件的相对路径（支持：yyyy, MM, dd, HH, mm, ss, E）
   uploadPath: 'files1/{yyyy}{MM}/'