3
0

27 Commity 05cf0fcf11 ... 8dc56e3272

Autor SHA1 Správa Dátum
  hzd 8dc56e3272 Merge branch 'master' of http://121.36.46.135:3000/mes-x13/mescloud 1 mesiac pred
  hzd 883ca3abd5 优化 1 mesiac pred
  hzd 14a5f9481b 优化 1 mesiac pred
  hzd e272b5f2b5 Merge branch 'master' of http://121.36.46.135:3000/mes-x13/mescloud 1 mesiac pred
  hzd 27c4f77875 优化 1 mesiac pred
  hzd 644638eb9e 替换记录 1 mesiac pred
  hzd 7f12a9375a 优化 1 mesiac pred
  hzd 11149d46c0 胶水有效期 2 mesiacov pred
  hzd 00fd6b0c0f Merge branch 'master' of http://121.36.46.135:3000/mes-x13/mescloud 2 mesiacov pred
  hzd 56aff634c8 优化 2 mesiacov pred
  zhuxiaolong 68a6c9d21f 返修区修改 2 mesiacov pred
  chefz 98db715391 Merge branch 'master' of http://121.36.46.135:3000/mes-x13/mescloud 2 mesiacov pred
  chefz 1d67663d74 返修区优化 2 mesiacov pred
  zhanghe 19a7a6a057 大屏数据 3 mesiacov pred
  jingbo 7e0ceeb6ef pda图片路径优化,增加视觉管控OP420 3 mesiacov pred
  jingbo 383f9e57e2 增加胶管更换 3 mesiacov pred
  zhanghe 69bb3049e4 Merge remote-tracking branch 'origin/master' 3 mesiacov pred
  zhanghe 4ed1fa4345 气密可提交三次 3 mesiacov pred
  zhanghe 7dfedf96e9 OP220子结果提交取消 3 mesiacov pred
  zhanghe 6c8a06ecd3 OP220子结果提交 3 mesiacov pred
  zhanghe c0d7e327b8 优化 3 mesiacov pred
  zhanghe 65efa0f7da Merge remote-tracking branch 'origin/master' 3 mesiacov pred
  zhanghe efdd084a04 Merge remote-tracking branch 'origin/master' 3 mesiacov pred
  zhanghe 7185f5dfaa 优化 4 mesiacov pred
  jingbo 2c332486bc GP12拍照上传优化 4 mesiacov pred
  jingbo 97263c089b 绑定内容接口优化 4 mesiacov pred
  jingbo 49663698e8 初始化 4 mesiacov pred

+ 4 - 4
src/main/java/com/jeesite/modules/mes/web/MesRepairController.java

@@ -619,10 +619,10 @@ public class MesRepairController extends BaseController {
 			resp.setMessage("产品信息不存在");
 			return resp;
 		}
-		if(!pd.getState().equals("0") && !pd.getState().equals("2")){
-			resp.setMessage("当前工件不能返修");
-			return resp;
-		}
+//		if(!pd.getState().equals("0") && !pd.getState().equals("2")){
+//			resp.setMessage("当前工件不能返修");
+//			return resp;
+//		}
 
 		MesRepair mesRepair = new MesRepair();
 		mesRepair.setSn(sn);