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 | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 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 5bcc59e..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("璐т綅涓嶅瓨鍦�");
}
@@ -95,7 +95,30 @@
throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
}
}
+ }
+ // 涓婃姤缁檈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("鍏ュ簱鎴愬姛");
}
@@ -256,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();
@@ -412,6 +435,7 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖]
param.getCustomerTypeId(), // 瀹㈡埛缂栧彿
null, // 缁忔墜浜虹紪鍙穂绌篯
+ null,
dto.getMatnr(), // 鍟嗗搧缂栧彿
dto.getCount(), // 鍟嗗搧鏁伴噺
dto.getCount(), // 鎬绘暟閲�
--
Gitblit v1.9.1