From b5e964367ac427a49ebfaa48d0d1517d5295bd72 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 01 四月 2021 16:19:15 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 107 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 89 insertions(+), 18 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 98d9b7a..1beff42 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 @@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import zy.cloud.wms.common.config.CodeCoolException; import zy.cloud.wms.common.model.BillDto; +import zy.cloud.wms.common.model.MatnrDto; import zy.cloud.wms.common.model.OrderStoDto; import zy.cloud.wms.common.service.MainService; import zy.cloud.wms.common.service.asrs.AsrsService; @@ -19,10 +20,7 @@ import zy.cloud.wms.manager.entity.result.StoPrintVo; import zy.cloud.wms.manager.service.*; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; +import java.util.*; /** * Created by vincent on 2021/2/25 @@ -52,6 +50,78 @@ private ErpService erpService; @Autowired private CheckService checkService; + + @Override + @Transactional + public R stockPakin(PakinParam param, Long userId) { + Node node = nodeService.selectByUuid(param.getNodeId()); + if (node == null) { + node = nodeService.selectById(param.getNodeId()); + } + if (node == null) { + return R.error("璐т綅涓嶅瓨鍦�"); + } + if (Cools.isEmpty(param.getMats())) { + return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖"); + } + Date now = new Date(); + for (MatnrDto dto : param.getMats()) { + Mat mat = matService.selectByMatnr(dto.getMatnr()); + if (mat == null) { + throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠$悊鍛�"); + } + LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr()); + if (locDetl == null) { + // 鏇存柊璐т綅搴撳瓨鏄庣粏 + locDetl = new LocDetl(); + locDetl.setLocNo(node.getName()); + locDetl.setNodeId(node.getId()); + locDetl.setZpallet(""); + locDetl.setAnfme(dto.getCount()); + VersionUtils.setLocDetl(locDetl, mat); +// locDetl.setDocId(param.getDocType().longValue()); +// locDetl.setDocNum(docNum); + locDetl.setStatus(1); + locDetl.setCreateBy(userId); + locDetl.setCreateTime(now); + locDetl.setUpdateBy(userId); + locDetl.setUpdateTime(now); + boolean insert = locDetlService.insert(locDetl); + if (!insert) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } else { + if (!locDetlService.incrementStock(node.getId(), dto.getMatnr(), dto.getCount())) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } + } + + // 涓婃姤缁檈rp + List<BillDto> dtos = new ArrayList<>(); + for (MatnrDto dto : param.getMats()) { + BillDto billDto = new BillDto(); + billDto.setMatnr(dto.getMatnr()); + billDto.setQty(dto.getCount()); + dtos.add(billDto); + } + Integer docId = Optional.ofNullable(param.getDocType()).orElse(34); + String docNum = String.valueOf(snowflakeIdWorker.nextId()); + switch (docId) { + case 34: // 閲囪喘鍗� + docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15); + break; + case 45: // 閿�鍞��璐у崟 + docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15); + break; + default: + break; + } + if (!erpService.uploadBill(dtos, docId, docNum)) { + throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); + } + return R.ok("鍏ュ簱鎴愬姛"); + } @Override @Transactional @@ -209,20 +279,20 @@ } // 閲囪喘閫�璐у崟 // if (param.getNumber().startsWith("PR-")) { - // erp鍗曟嵁涓婁紶 - Long docId = pakouts.get(0).getDocId(); - if (null != docId) { - List<BillDto> dtos = new ArrayList<>(); - for (Pakout pakout : pakouts) { - BillDto billDto = new BillDto(); - billDto.setMatnr(pakout.getMatnr()); - billDto.setQty(pakout.getAnfme()); - dtos.add(billDto); - } - if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) { - throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); - } - } + // erp鍗曟嵁涓婁紶 todo +// Long docId = pakouts.get(0).getDocId(); +// if (null != docId) { +// List<BillDto> dtos = new ArrayList<>(); +// for (Pakout pakout : pakouts) { +// BillDto billDto = new BillDto(); +// billDto.setMatnr(pakout.getMatnr()); +// billDto.setQty(pakout.getAnfme()); +// dtos.add(billDto); +// } +// if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) { +// throw new CoolException("鏃犳硶涓婃姤鑷砮rp"); +// } +// } // } return R.ok(); @@ -365,6 +435,7 @@ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖] param.getCustomerTypeId(), // 瀹㈡埛缂栧彿 null, // 缁忔墜浜虹紪鍙穂绌篯 + null, dto.getMatnr(), // 鍟嗗搧缂栧彿 dto.getCount(), // 鍟嗗搧鏁伴噺 dto.getCount(), // 鎬绘暟閲� -- Gitblit v1.9.1