From 28b01f6a80a38883d61b456b13936baa0291664e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 四月 2021 13:45:21 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 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 25d03af..0c0cb46 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
@@ -38,15 +38,11 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private CustOrderService custOrderService;
- @Autowired
private PakoutService pakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private MatService matService;
- @Autowired
- private ErpService erpService;
@Autowired
private CheckService checkService;
@Autowired
@@ -57,6 +53,8 @@
private ItemService itemService;
@Autowired
private CstmrService cstmrService;
+ @Autowired
+ private ErpService erpService;
@Override
@Transactional
@@ -127,6 +125,7 @@
if (!erpService.uploadBill(dtos, docId, docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
+
return R.ok("鍏ュ簱鎴愬姛");
}
@@ -202,7 +201,6 @@
if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
-
return R.ok();
}
@@ -414,7 +412,7 @@
}
if (complete) {
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ if (!orderService.updateSettle(pakout.getDocNum(), 4L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -429,35 +427,14 @@
@Transactional
public R cancelPakout(String wrkNo, Long userId) {
Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
-// if (null != pakout) {
-// LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
-// if (locDetl == null) {
-// LocDetl oldLocDetl = new LocDetl();
-// VersionUtils.setLocDetl(oldLocDetl, pakout);
-// oldLocDetl.setCreateTime(new Date());
-// oldLocDetl.setCreateBy(userId);
-// oldLocDetl.setUpdateTime(new Date());
-// oldLocDetl.setUpdateBy(userId);
-// if (!locDetlService.insert(oldLocDetl)) {
-// throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
-// }
-// } else {
-// if (!locDetlService.incrementStock(locDetl.getNodeId(), locDetl.getMatnr(), pakout.getAnfme())) {
-// throw new CoolException("鎭㈠搴撳瓨鏄庣粏澶辫触");
-// }
-// }
-// } else {
-// return R.error("鎷ｈ揣鍗曞凡澶辨晥锛屽彇娑堝け璐ワ紒");
-// }
if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
throw new CoolException("鍒犻櫎鎷ｈ揣鍗曞け璐�");
}
-
// 鍙栨秷閿�鍞鍗�
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
if (Cools.isEmpty(pakouts)){
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
+ if (!orderService.updateSettle(pakout.getDocNum(), 3L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -739,7 +716,6 @@
if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
-
return R.ok();
}
--
Gitblit v1.9.1