质量检查回退

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

@@ -269,4 +269,4 @@ public class MesProductRepairQualityController extends BaseController {
 		return resp;
 	}
 	
-}
+}

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

@@ -149,15 +149,10 @@ 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;
@@ -181,18 +176,10 @@ public class MesRepairQualityController extends BaseController {
 			resp.setMessage("返修记录不存在");
 			return resp;
 		}
-		if(mesRepair.getState().equals("1")){
-			resp.setMessage("当前工件未返修！");
-			return resp;
-		}
-		if(mesRepair.getState().equals("3")){
+		if(!mesRepair.getState().equals("2")){
 			resp.setMessage("当前工件已检查！");
 			return resp;
 		}
-		if(mesRepair.getState().equals("4")){
-			resp.setMessage("当前工件返修NG待处理！");
-			return resp;
-		}
 
 		MesRepairQuality mesRepairQuality = new MesRepairQuality();
 		mesRepairQuality.setRepairId(mesRepair.getId());
@@ -207,7 +194,6 @@ 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();
@@ -223,9 +209,9 @@ public class MesRepairQualityController extends BaseController {
 			pp.setContent("OK");
 			mesProductRecordService.save(pp);
 
-			String repairItemId = "18565249649801748481111-111";
+			String repairItemId = "18565249649801748481111";
 			if(mesRepair.getItemId().equals(repairItemId)){ // 底护板更换
-				String[] qmoprnos = new String[]{"OP430", "OP440", "OP450", "OP460", "OP470", "OP480", "OP490", "OP500", "OP510", "OP520", "OP550"};
+				String[] qmoprnos = new String[]{"OP330","OP360","OP370","OP380","OP390","OP400","OP410"};
 				for (String op:qmoprnos){
 					// 返回工位改成UDF
 					MesProductRecord mesProductRecord2 = new MesProductRecord();
@@ -248,35 +234,6 @@ public class MesRepairQualityController extends BaseController {
 				pp2.setContent("UDF");
 				mesProductRecordService.save(pp2);
 			}
-
-			// 气密是否需要重新做
-			MesRepairItems mesRepairItems = mesRepairItemsService.get(mesRepair.getItemId());
-			if(!ObjectUtils.isEmpty(mesRepairItems)){
-				if("1".equals(mesRepairItems.getIsCp())){
-					String cpoprno = "OP450";
-					MesProductRecord mesProductRecord2 = new MesProductRecord();
-					mesProductRecord2.setSn(mesRepair.getSn());
-					mesProductRecord2.setOprno(cpoprno);
-					mesProductRecord2.setCraft("100000");
-					MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-					if(!ObjectUtils.isEmpty(pp2)){
-						pp2.setContent("UDF");
-						mesProductRecordService.save(pp2);
-					}
-				}
-				if("1".equals(mesRepairItems.getIsYl())){
-					String yloprno = "OP460";
-					MesProductRecord mesProductRecord2 = new MesProductRecord();
-					mesProductRecord2.setSn(mesRepair.getSn());
-					mesProductRecord2.setOprno(yloprno);
-					mesProductRecord2.setCraft("100000");
-					MesProductRecord pp2 = mesProductRecordService.findInfo(mesProductRecord2);
-					if(!ObjectUtils.isEmpty(pp2)){
-						pp2.setContent("UDF");
-						mesProductRecordService.save(pp2);
-					}
-				}
-			}
 		}
 
 		if(result.equals("1")){ // 返修OK
@@ -323,4 +280,4 @@ public class MesRepairQualityController extends BaseController {
 		resp.setResult(Global.TRUE);
 		return resp;
 	}
-}
+}