返修区优化

src/main/java/com/jeesite/modules/mes/entity/MesRepair.java

@@ -23,6 +23,7 @@ import java.util.List;
 		@Column(name="sn", attrName="sn", label="工件号"),
 		@Column(name="fx_oprno", attrName="fxOprno", label="返修工位"),
 		@Column(name="oprno", attrName="oprno", label="责任工位"),
+		@Column(name="return_oprno", attrName="returnOprno", label="返回工位"),
 		@Column(name="sops", attrName="sops", label="选择的修复方案", isQuery=false),
 		@Column(name="state", attrName="state", label="状态"),
 		@Column(name="remark", attrName="remark", label="备注"),

src/main/java/com/jeesite/modules/mes/entity/MesRepairItems.java

@@ -25,6 +25,8 @@ import javax.validation.constraints.Size;
 		@Column(name="inspection_points", attrName="inspectionPoints", label="检查要点"),
 		@Column(name="return_oprno", attrName="returnOprno", label="回归工位"),
 		@Column(name="type", attrName="type", label="返工类型"),
+		@Column(name="is_cp", attrName="isCp", label="成品气密"),
+		@Column(name="is_yl", attrName="isYl", label="液冷气密"),
 		@Column(name="create_by", attrName="createBy", label="create_by", isUpdate=false, isQuery=false),
 		@Column(name="create_date", attrName="createDate", label="create_date", isUpdate=false, isQuery=false, isUpdateForce=true),
 		@Column(name="update_by", attrName="updateBy", label="update_by", isQuery=false),
@@ -53,6 +55,8 @@ public class MesRepairItems extends DataEntity<MesRepairItems> {
 	private String type;          // 离线/在线返工
 
 	private String oprnoName;
+	private String isCp;
+	private String isYl;
 
 	public String getOprnoName() {
 		return oprnoName;
@@ -93,6 +97,23 @@ public class MesRepairItems extends DataEntity<MesRepairItems> {
 	public void setLineSn(String lineSn) {
 		this.lineSn = lineSn;
 	}
+
+	public String getIsCp() {
+		return isCp;
+	}
+
+	public void setIsCp(String isCp) {
+		this.isCp = isCp;
+	}
+
+	public String getIsYl() {
+		return isYl;
+	}
+
+	public void setIsYl(String isYl) {
+		this.isYl = isYl;
+	}
+
 	public MesRepairItems() {
 		this(null);
 	}

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

@@ -590,6 +590,7 @@ public class MesRepairController extends BaseController {
 		resp.setResult(Global.FALSE);
 		String sn = req.getParameter("sn");
 		String fxOprno = req.getParameter("fxOprno");
+		String oprno = req.getParameter("oprno");
 		String itemId = req.getParameter("itemId");
 		String remark = req.getParameter("remark");
 		String type = req.getParameter("type");
@@ -634,7 +635,7 @@ public class MesRepairController extends BaseController {
 
 		MesProductRecord mesProductRecord = new MesProductRecord();
 		mesProductRecord.setSn(sn);
-		mesProductRecord.setOprno(mesRepairItems.getOprno());
+		mesProductRecord.setOprno(oprno);
 		mesProductRecord.setCraft("100000");
 		MesProductRecord ngInfo = mesProductRecordService.findInfo(mesProductRecord);
 		if(ObjectUtils.isEmpty(ngInfo)){
@@ -652,7 +653,7 @@ public class MesRepairController extends BaseController {
 		mesRepair2.setLineSn(mesRepairItems.getLineSn());
 		mesRepair2.setItemId(itemId);
 		mesRepair2.setRemark(remark);
-		mesRepair2.setOprno(mesRepairItems.getOprno());
+		mesRepair2.setOprno(oprno);
 		mesRepair2.setType(type);
 		if(type.equals("1")){ // 在线返修
 			mesRepair2.setState("2");

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

@@ -9,15 +9,9 @@ import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.file.entity.FileUpload;
 import com.jeesite.modules.file.service.FileUploadService;
 import com.jeesite.modules.file.utils.FileUploadUtils;
-import com.jeesite.modules.mes.entity.MesProduct;
-import com.jeesite.modules.mes.entity.MesProductRecord;
-import com.jeesite.modules.mes.entity.MesRepair;
-import com.jeesite.modules.mes.entity.MesRepairQuality;
+import com.jeesite.modules.mes.entity.*;
 import com.jeesite.modules.mes.resp.CommonResp;
-import com.jeesite.modules.mes.service.MesProductRecordService;
-import com.jeesite.modules.mes.service.MesProductService;
-import com.jeesite.modules.mes.service.MesRepairQualityService;
-import com.jeesite.modules.mes.service.MesRepairService;
+import com.jeesite.modules.mes.service.*;
 import com.jeesite.modules.sys.entity.User;
 import com.jeesite.modules.sys.utils.UserUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -52,6 +46,8 @@ public class MesRepairQualityController extends BaseController {
 	@Autowired
 	private MesRepairService mesRepairService;
 	@Autowired
+	private MesRepairItemsService mesRepairItemsService;
+	@Autowired
 	private FileUploadService fileUploadService;
 	@Autowired
 	private MesProductService mesProductService;
@@ -153,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;
@@ -180,10 +181,18 @@ 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;
 		}
+		if(mesRepair.getState().equals("4")){
+			resp.setMessage("当前工件返修NG待处理！");
+			return resp;
+		}
 
 		MesRepairQuality mesRepairQuality = new MesRepairQuality();
 		mesRepairQuality.setRepairId(mesRepair.getId());
@@ -198,6 +207,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();
@@ -238,6 +248,31 @@ 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);
+					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);
+					pp2.setContent("UDF");
+					mesProductRecordService.save(pp2);
+				}
+			}
 		}
 
 		if(result.equals("1")){ // 返修OK

src/main/resources/config/application.yml

@@ -54,13 +54,13 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-#  url: jdbc:mysql://127.0.0.1:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3307/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   url: jdbc:mysql://192.168.21.99:3306/mescloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://127.0.0.1:3390/mes-x13?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
   username: mescloud
   password: 8neywEN86NLam3ts
 #  username: root
-#  password: root
+#  password: 123456
 #
   testSql: SELECT 1