From 0d334766bcd06f6ce8678caed5747600f74b4d21 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 23 三月 2021 14:20:37 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 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 74ca754..b10d741 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
@@ -12,6 +12,7 @@
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
+import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
@@ -46,6 +47,8 @@
private MatService matService;
@Autowired
private AsrsService asrsService;
+ @Autowired
+ private ErpService erpService;
@Override
@Transactional
@@ -59,6 +62,7 @@
return R.error("鐗╂枡涓嶅瓨鍦�");
}
Date now = new Date();
+ String docNum = String.valueOf(snowflakeIdWorker.nextId());
for (Comb comb : combs) {
// 鏀瑰彉缁勬墭妗ｇ姸鎬�
comb.setIoStatus(4);
@@ -77,6 +81,8 @@
locDetl.setZpallet(param.getZpallet());
locDetl.setAnfme(comb.getAnfme());
VersionUtils.setLocDetl(locDetl, comb);
+ locDetl.setDocId(param.getDocType().longValue());
+ locDetl.setDocNum(docNum);
locDetl.setStatus(1);
locDetl.setCreateBy(userId);
locDetl.setCreateTime(now);
@@ -94,6 +100,12 @@
}
}
+
+ // 涓婃姤缁檈rp
+ if (!erpService.uploadBill(combs, param.getDocType(), docNum)) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+
return R.ok();
}
@@ -352,17 +364,17 @@
}
}
if (asrs) {
- if (asrsService.stockTransfer(params)) {
- for (StockTransferParam param : params) {
- // 淇敼閿�鍞鍗曞緟鍑烘暟閲�
- if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
- throw new CoolException("淇敼閿�鍞鍗曞緟鍑烘暟閲忓け璐�");
- }
- }
- return R.ok("搴撳瓨璋冩嫧鎴愬姛");
- } else {
- return R.error("绔嬪簱璋冩嫧澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+// if (asrsService.stockTransfer(params)) {
+// for (StockTransferParam param : params) {
+// // 淇敼閿�鍞鍗曞緟鍑烘暟閲�
+// if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
+// throw new CoolException("淇敼閿�鍞鍗曞緟鍑烘暟閲忓け璐�");
+// }
+// }
+// return R.ok("搴撳瓨璋冩嫧鎴愬姛");
+// } else {
+// return R.error("绔嬪簱璋冩嫧澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
}
return R.error("鏆備笉缂鸿揣锛屼笉闇�瑕佺珛搴撹皟鎷�");
}
--
Gitblit v1.9.1