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 | 60 +++++++++---------------------------------------------------
1 files changed, 9 insertions(+), 51 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 97bb4bc..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();
}
@@ -257,7 +255,7 @@
vo.setList(pakouts);
vo.setTotal(total);
vo.setCstmrName(order.getCstmrName());
- vo.setWorkerName(order.getOperMemb());
+ vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
return R.ok().add(vo);
}
@@ -265,7 +263,7 @@
@Transactional
public R stockOutComplete(StockConfirmParam param, Long userId) {
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
- .eq("doc_num", param.getNumber())
+ .eq("doc_num", param.getOrderNo())
.in("wrk_sts", 1, 2));
for (Pakout pakout : pakouts) {
LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
@@ -334,31 +332,13 @@
}
// 淇敼鍑哄簱鍗曠姸鎬�
- if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getOrderNo(), userId)) {
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ if (!orderService.updateSettle(param.getOrderNo(), 4L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
- // 閲囪喘閫�璐у崟
-// if (param.getNumber().startsWith("PR-")) {
- // 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();
}
@@ -432,7 +412,7 @@
}
if (complete) {
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ if (!orderService.updateSettle(pakout.getDocNum(), 4L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -447,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("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -757,7 +716,6 @@
if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
-
return R.ok();
}
--
Gitblit v1.9.1