From 967bfd405284931fc69e4bf92636cd753215c982 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 02 四月 2021 17:02:35 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 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 6c071b1..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 @@ -20,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 @@ -58,6 +55,9 @@ @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("璐т綅涓嶅瓨鍦�"); } @@ -96,6 +96,30 @@ } } } + + // 涓婃姤缁檈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("鍏ュ簱鎴愬姛"); } -- Gitblit v1.9.1