From e4ea838c20e94dff4fdbb4f82b542a8b5790fa9d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 18 六月 2021 09:22:06 +0800 Subject: [PATCH] # 库存跳转上报erp --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 71 +++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java index 2b7e6f3..b494987 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java @@ -616,32 +616,61 @@ } } // 鐩存帴澧炲姞搴撳瓨 - LocDetl locDetl = locDetlService.getLocDetl(param.getNode_id(), param.getMatnr()); - if (locDetl == null) { - // 鏇存柊璐т綅搴撳瓨鏄庣粏 - locDetl = new LocDetl(); - locDetl.setLocNo(node.getName()); - locDetl.setNodeId(node.getId()); - locDetl.setAnfme(anfme); - VersionUtils.setLocDetl(locDetl, mat); - locDetl.setStatus(1); - locDetl.setCreateBy(userId); - locDetl.setCreateTime(new Date()); - locDetl.setUpdateBy(userId); - locDetl.setUpdateTime(new Date()); - boolean insert = locDetlService.insert(locDetl); - if (!insert) { - throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); - } - } else { - if (!locDetlService.incrementStock(node.getId(), param.getMatnr(), anfme)) { - throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); +// LocDetl locDetl = locDetlService.getLocDetl(param.getNode_id(), param.getMatnr()); +// if (locDetl == null) { +// // 鏇存柊璐т綅搴撳瓨鏄庣粏 +// locDetl = new LocDetl(); +// locDetl.setLocNo(node.getName()); +// locDetl.setNodeId(node.getId()); +// locDetl.setAnfme(anfme); +// VersionUtils.setLocDetl(locDetl, mat); +// locDetl.setStatus(1); +// locDetl.setCreateBy(userId); +// locDetl.setCreateTime(new Date()); +// locDetl.setUpdateBy(userId); +// locDetl.setUpdateTime(new Date()); +// boolean insert = locDetlService.insert(locDetl); +// if (!insert) { +// throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); +// } +// } else { +// if (!locDetlService.incrementStock(node.getId(), param.getMatnr(), anfme)) { +// throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); +// } +// } + + return R.ok("琛ヤ粨鎴愬姛锛岀瓑寰呯珛搴撹皟鎷�"); + } + + @Override + public R asrsStockTransferLocMode(AsrsTransferParam param, Long userId) { + if (Cools.isEmpty(param.getNode_id(), param.getMatnr(), param.getSafe_qua(), param.getAmount())) { + return R.error("鏁伴噺閿欒"); + } + Node node = nodeService.selectById(param.getNode_id()); + Mat mat = matService.selectByMatnr(param.getMatnr()); + if (node == null || mat == null) { + return R.error(); + } + double anfme = Arith.subtract(2, param.getSafe_qua(), param.getAmount()); + List<StockTransferParam> params = new ArrayList<>(); + StockTransferParam transferParam = new StockTransferParam(); + transferParam.setMatnr(param.getMatnr()); + transferParam.setAnfme(anfme); + transferParam.setAllotNo(param.getNode_id()+ "_" +param.getMatnr()); + transferParam.setLocNo(param.getLocNo()); + params.add(transferParam); + Result1 result = asrsService.stockTransferLocMode(params); + if (result.getCode() == 500) { + if (Cools.isEmpty(result.getData())) { + throw new CoolException(result.getMsg()); + } else { + throw new CodeCoolException("20001-" + result.getData()); } } return R.ok("琛ヤ粨鎴愬姛锛岀瓑寰呯珛搴撹皟鎷�"); } - @Override public R stockCheck(StoCheckParam param, Long userId) { -- Gitblit v1.9.1