erp和080工位修改

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

@@ -96,23 +96,33 @@ public class MesMaterialController extends BaseController {
 	@PostMapping(value = "saveMaterial")
 	@ResponseBody
 	public String saveMaterial(@Validated MesMaterial mesMaterial) {
-		if (StringUtils.isBlank(mesMaterial.getTitle())) {
-			return renderResult(Global.FALSE, text("部件名称不能为空！"));
-		}
-		if (StringUtils.isBlank(mesMaterial.getSpec())) {
-			return renderResult(Global.FALSE, text("部件规格不能为空！"));
-		}
+//		if (StringUtils.isBlank(mesMaterial.getTitle())) {
+//			return renderResult(Global.FALSE, text("部件名称不能为空！"));
+//		}
+//		if (StringUtils.isBlank(mesMaterial.getSpec())) {
+//			return renderResult(Global.FALSE, text("部件规格不能为空！"));
+//		}
 		if (StringUtils.isBlank(mesMaterial.getErpSn())) {
 			return renderResult(Global.FALSE, text("ERP编码不能为空！"));
 		}
-		if (StringUtils.isBlank(mesMaterial.getUnit())) {
-			return renderResult(Global.FALSE, text("单位不能为空！"));
-		}
-		if (StringUtils.isBlank(mesMaterial.getHouse())) {
-			return renderResult(Global.FALSE, text("仓库不能为空！"));
-		}
-		if (StringUtils.isBlank(mesMaterial.getLocation())) {
-			return renderResult(Global.FALSE, text("库位不能为空！"));
+//		if (StringUtils.isBlank(mesMaterial.getUnit())) {
+//			return renderResult(Global.FALSE, text("单位不能为空！"));
+//		}
+//		if (StringUtils.isBlank(mesMaterial.getHouse())) {
+//			return renderResult(Global.FALSE, text("仓库不能为空！"));
+//		}
+//		if (StringUtils.isBlank(mesMaterial.getLocation())) {
+//			return renderResult(Global.FALSE, text("库位不能为空！"));
+//		}
+		MesMaterial oldmm=new MesMaterial();
+		oldmm.setErpSn(mesMaterial.getErpSn());
+		List<MesMaterial> list = mesMaterialService.findList(oldmm);
+		if(!list.isEmpty()){
+			MesMaterial mm=list.get(0);
+			mm.setHouse(mesMaterial.getHouse());
+			mm.setLocation(mesMaterial.getLocation());
+			mesMaterialService.update(mm);
+			return renderResult(Global.TRUE, text("保存物料表成功！"));
 		}
 		mesMaterialService.save(mesMaterial);
 		return renderResult(Global.TRUE, text("保存物料表成功！"));

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

@@ -228,6 +228,7 @@ public class MesMaterialRkController extends BaseController {
 	@RequestMapping(value = "mesToErp")
 	@ResponseBody
 	public String mesToErp(MesMaterialRk mesMaterialRk) {
+		mesMaterialRkService.save(mesMaterialRk);
 		if (StringUtils.isNotBlank(mesMaterialRk.getId())) {
 			mesMaterialRk = mesMaterialRkService.get(mesMaterialRk);
 		}

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

@@ -2691,6 +2691,10 @@ public String check(@RequestBody MesElectricTorque mesElectricTorque,HttpServlet
 			resp.setResult(Global.FALSE);
 		}
 
+		if(oprno.equals("OP080") && checkret.equalsIgnoreCase("OK")){
+			resp.setMessage("工件可以加工");
+			resp.setResult(Global.TRUE);
+		}
 		resp.setData(checkret);
 		return resp;
 	}

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

@@ -216,12 +216,14 @@ public class MesRepairController extends BaseController {
 			return resp1;
 		}
 
-		mesProduct.setSn(sn);
-		MesProduct pd = mesProductService.findInfo(mesProduct);
-		if(ObjectUtils.isEmpty(pd)){
+		MesProduct queryProduct = new MesProduct();
+		queryProduct.setSn(sn);
+		List<MesProduct> list = mesProductService.findList(queryProduct);
+		if (ListUtils.isEmpty(list)) {
 			resp1.setMessage("产品信息不存在");
 			return resp1;
 		}
+		MesProduct pd = list.get(0);
 		if(!pd.getState().equals("0") && !pd.getState().equals("2")){
 			resp1.setMessage("当前工件不能返修");
 			return resp1;