From 087fa4727850ecbf33ba5d4493afdac1cef28120 Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Tue, 12 May 2020 21:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wm/controller/WmToUpGoodsController.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java index 984959e1..a06926b9 100644 --- a/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java +++ b/src/main/java/com/zzjee/wm/controller/WmToUpGoodsController.java @@ -468,20 +468,20 @@ public class WmToUpGoodsController extends BaseController { try{ D0.setOK(true); WmInQmIEntity wmInQmIEntity = systemService.get(WmInQmIEntity.class,wmToUpGoods.getOrderIdI()); - if(wmInQmIEntity!=null){ - if("Y".equals(wmInQmIEntity.getBinSta())){ - D0.setOK(false); - D0.setErrorMsg("已经上架，不能重复上架"); - return new ResponseEntity(D0, HttpStatus.OK); - } - wmInQmIEntity.setBinSta("Y"); - systemService.updateEntitie(wmInQmIEntity); - }else{ - D0.setOK(false); - D0.setErrorMsg("验收任务已经删除，不能上架"); - - return new ResponseEntity(D0, HttpStatus.OK); - } +// if(wmInQmIEntity!=null){ +// if("Y".equals(wmInQmIEntity.getBinSta())){ +// D0.setOK(false); +// D0.setErrorMsg("已经上架，不能重复上架"); +// return new ResponseEntity(D0, HttpStatus.OK); +// } +// wmInQmIEntity.setBinSta("Y"); +// systemService.updateEntitie(wmInQmIEntity); +// }else{ +// D0.setOK(false); +// D0.setErrorMsg("验收任务已经删除，不能上架"); +// +// return new ResponseEntity(D0, HttpStatus.OK); +// } if(StringUtil.isNotEmpty(wmToUpGoods.getOrderIdI())){ List wmToUpGoodsEntity = systemService.findByProperty(WmToUpGoodsEntity.class,"orderIdI",wmToUpGoods.getOrderIdI()); if(wmToUpGoodsEntity!=null&&wmToUpGoodsEntity.size()>0){