From a955772ea0908d6747035661e9bcffb7fb4ba961 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期二, 07 十二月 2021 10:01:11 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 128 +++++++++++++++++++++++++++++++++--------- 1 files changed, 100 insertions(+), 28 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..290cbac 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 @@ -17,6 +17,7 @@ import zy.cloud.wms.common.service.MainService; import zy.cloud.wms.common.service.asrs.AsrsService; import zy.cloud.wms.common.service.asrs.entity.Result1; +import zy.cloud.wms.common.service.erp.ErpR; import zy.cloud.wms.common.service.erp.ErpService; import zy.cloud.wms.common.utils.VersionUtils; import zy.cloud.wms.manager.entity.*; @@ -61,13 +62,19 @@ private ErpService erpService; @Autowired private AsrsService asrsService; + @Autowired + private PakinService pakinService; @Override @Transactional public R stockPakin(PakinParam param, Long userId) { Node node = nodeService.selectByUuid(param.getNodeId()); if (node == null) { - node = nodeService.selectById(param.getNodeId()); + try { + node = nodeService.selectById(param.getNodeId()); + } catch (Exception e) { + return R.error("璐т綅涓嶅瓨鍦�"); + } } if (node == null) { return R.error("璐т綅涓嶅瓨鍦�"); @@ -92,6 +99,39 @@ Mat mat = matService.selectByMatnr(dto.getMatnr()); if (mat == null) { throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠$悊鍛�"); + } + // 淇濆瓨鍏ュ簱璁板綍 + Pakin pakin = new Pakin( + "I" + String.valueOf(snowflakeIdWorker.nextId()), // 浠诲姟鍙穂闈炵┖] + null, // 宸ヤ綔鐘舵�� + null, // 鎵樼洏鍙� + dto.getCount(), // 鍏ュ簱鏁伴噺 + node.getId(), // 鍏宠仈璐т綅[闈炵┖] + node.getUuid(), // 璐т綅[闈炵┖] + mat.getMatnr(), // 鍟嗗搧缂栫爜[闈炵┖] + null, // 鍟嗗搧鍚嶇О + null, // 鍚嶇О + null, // 灏虹爜 + null, // 鍨嬪彿 + null, // 鎵瑰彿 + null, // 鍗曚綅 + null, // SKC + null, // 鍗曟嵁绫诲瀷 + null, // 鍗曟嵁缂栧彿 + null, // 瀹㈡埛鍚嶇О + null, // 鍝侀」鏁� + null, // 鏁伴噺 + null, // 閲嶉噺 + 1, // 鐘舵�� + userId, // 娣诲姞浜哄憳 + now, // 娣诲姞鏃堕棿 + userId, // 淇敼浜哄憳 + now, // 淇敼鏃堕棿 + null // 澶囨敞 + ); + VersionUtils.setPakin(pakin, mat); + if (!pakinService.insert(pakin)) { + throw new CoolException("淇濆瓨鍏ュ簱璁板綍澶辫触"); } LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr()); if (locDetl == null) { @@ -128,8 +168,9 @@ billDto.setQty(dto.getCount()); dtos.add(billDto); } - if (!erpService.uploadBill(dtos, docId, docNum)) { - throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); + ErpR erpR = erpService.uploadBill(dtos, docId, docNum); + if (!erpR.getSuccess()) { + throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg()); } return R.ok("鍏ュ簱鎴愬姛"); @@ -260,8 +301,9 @@ billDto.setQty(comb.getAnfme()); dtos.add(billDto); } - if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) { - throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); + ErpR erpR = erpService.uploadBill(dtos, param.getDocType(), docNum); + if (!erpR.getSuccess()) { + throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg()); } return R.ok(); } @@ -616,32 +658,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) { @@ -844,8 +915,9 @@ billDto.setMatnr(check.getMatnr()); billDto.setQty(Math.abs(check.getDiffQty())); dtos.add(billDto); - if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) { - throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); + ErpR erpR = erpService.uploadBill(dtos, docId.intValue(), docNum); + if (!erpR.getSuccess()) { + throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg()); } return R.ok(); } -- Gitblit v1.9.1