From 98539ddf737e6236bb095fe301affa3a87bd9506 Mon Sep 17 00:00:00 2001 From: e Date: Wed, 15 Jan 2020 15:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wave/controller/WaveToDownController.java | 41 +++++++++++++++---- .../wave/controller/WaveToFjController.java | 19 ++++----- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java index 0436171d..f94a1107 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToDownController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToDownController.java @@ -424,24 +424,49 @@ public class WaveToDownController extends BaseController { return new ResponseEntity(waveToDown, HttpStatus.OK); } - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jsondown", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity update(@RequestBody WaveToDownEntity waveToDown) { + ResultDO D0 = new ResultDO(); + //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(waveToDown); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } //保存 try{ - waveToDownService.saveOrUpdate(waveToDown); + String hql = "from WmOmQmIEntity where waveId = ? and goodsId = ? and proData = ? and tinId = ? and binId = ? and binSta = ?"; + List listwavedown = systemService.findHql(hql,waveToDown.getWaveId(),waveToDown.getGoodsId(),waveToDown.getProData(),waveToDown.getTinId(),waveToDown.getBinId(),"N"); + + for(WmOmQmIEntity wmOmQmI: listwavedown){ + WmToDownGoodsEntity wmToDownGoods = new WmToDownGoodsEntity(); + wmToDownGoods.setBinIdFrom(wmOmQmI.getTinId());//下架托盘 + wmToDownGoods.setKuWeiBianMa(wmOmQmI.getBinId());//储位 + wmToDownGoods.setBinIdTo(wmOmQmI.getOmNoticeId());//到托盘 + wmToDownGoods.setCusCode(wmOmQmI.getCusCode());//货主 + wmToDownGoods.setGoodsId(wmOmQmI.getGoodsId());// + wmToDownGoods.setGoodsProData(wmOmQmI.getProData());//生产日期 + wmToDownGoods.setOrderId(wmOmQmI.getOmNoticeId());//出货通知单 + wmToDownGoods.setOrderIdI(wmOmQmI.getId());//出货通知项目 + wmToDownGoods.setBaseUnit(wmOmQmI.getBaseUnit());//基本单位 + wmToDownGoods.setBaseGoodscount(wmOmQmI.getBaseGoodscount());//基本单位数量 + wmToDownGoods.setGoodsUnit(wmOmQmI.getGoodsUnit());//出货单位 + wmToDownGoods.setGoodsQua(wmOmQmI.getQmOkQuat());//出货数量 + wmToDownGoods.setGoodsQuaok(wmOmQmI.getQmOkQuat());//出货数量 + wmToDownGoods.setGoodsName(wmOmQmI.getGoodsName());//商品名称 + wmToDownGoods.setOmBeizhu(wmOmQmI.getOmBeizhu());//备注 + wmToDownGoods.setImCusCode(wmOmQmI.getImCusCode());//客户单号 + wmToDownGoods.setOrderType("01");//默认为01 + systemService.save(wmToDownGoods); + wmOmQmI.setBinSta("H"); + wmOmQmI.setFirstRq(waveToDown.getFirstRq()); + systemService.saveOrUpdate(wmOmQmI); + } + } catch (Exception e) { e.printStackTrace(); return new ResponseEntity(HttpStatus.NO_CONTENT); } - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return new ResponseEntity(HttpStatus.NO_CONTENT); + + return new ResponseEntity(waveToDown, HttpStatus.OK); } @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) diff --git a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java index e805b9e0..29dea609 100644 --- a/src/main/java/com/zzjee/wave/controller/WaveToFjController.java +++ b/src/main/java/com/zzjee/wave/controller/WaveToFjController.java @@ -384,24 +384,23 @@ public class WaveToFjController extends BaseController { return new ResponseEntity(waveToFj, HttpStatus.OK); } - @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jsonfj", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity update(@RequestBody WaveToFjEntity waveToFj) { + ResultDO D0 = new ResultDO(); //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. - Set> failures = validator.validate(waveToFj); - if (!failures.isEmpty()) { - return new ResponseEntity(BeanValidators.extractPropertyAndMessage(failures), HttpStatus.BAD_REQUEST); - } - //保存 try{ - waveToFjService.saveOrUpdate(waveToFj); + WmOmQmIEntity wmOmQmI = systemService.getEntity( + WmOmQmIEntity.class, waveToFj.getId()); + if (wmOmQmI != null&&wmOmQmI.getBinSta().equals("H")) { + wmOmQmI.setBinSta("Y"); + systemService.saveOrUpdate(wmOmQmI); + } } catch (Exception e) { e.printStackTrace(); return new ResponseEntity(HttpStatus.NO_CONTENT); } - - //按Restful约定，返回204状态码, 无内容. 也可以返回200状态码. - return new ResponseEntity(HttpStatus.NO_CONTENT); + return new ResponseEntity(waveToFj, HttpStatus.OK); } @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)