From 47015b98442acc527509235d5b9c22857751aeef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 17:39:00 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 96a73ef..c357fd3 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
@@ -213,7 +213,7 @@
@Override
public R stockOutPrint(StockOutParam param, Long userId) {
- List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getOrderNo()));
Double total = 0.0D;
String custName = "";
for (Pakout pakout : pakouts) {
@@ -221,7 +221,7 @@
custName = pakout.getCustName();
}
StoPrintVo vo = new StoPrintVo();
- vo.setDocNum(param.getNumber());
+ vo.setDocNum(param.getOrderNo());
vo.setList(pakouts);
vo.setTotal(total);
vo.setCustName("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
@@ -231,25 +231,29 @@
@Override
public R stockOutPreview(StockOutParam param, Long userId) {
- List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
- .eq("number", param.getNumber())
- .eq("status", 1)
- );
- OrderStoDto dto = new OrderStoDto();
- dto.setNumber(param.getNumber());
- dto.setCustOrders(custOrders);
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order.getSettle() != 1) {
+ return R.error("姝ゅ崟鎹棤娉曠敓鎴愭嫞璐у崟");
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(order.getOrderNo());
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
+ }
+ OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
return R.ok().add(mainService.stockOutPreview(dto));
}
@Override
public R stockOut(StockOutParam param, Long userId) {
- List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>()
- .eq("number", param.getNumber())
- .eq("status", 1)
- );
- OrderStoDto dto = new OrderStoDto();
- dto.setNumber(param.getNumber());
- dto.setCustOrders(custOrders);
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order.getSettle() != 1) {
+ return R.error("姝ゅ崟鎹棤娉曠敓鎴愭嫞璐у崟");
+ }
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(param.getOrderNo());
+ if (Cools.isEmpty(orderDetls)) {
+ return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
+ }
+ OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
@@ -515,7 +519,7 @@
null, // 鍙戣揣鏃堕棿
null, // 鐗╂祦鍚嶇О
null, // 鐗╂祦鍗曞彿
- null, // 璁㈠崟鐘舵��
+ 1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
@@ -523,8 +527,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
- Integer orderId = orderService.insertReturnId(order);
- if (orderId == 0) {
+ if (!orderService.insert(order)) {
throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
}
// 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
@@ -535,7 +538,7 @@
continue;
}
OrderDetl orderDetl = new OrderDetl();
- orderDetl.setOrderId(orderId.longValue()); // 璁㈠崟鍐呯爜
+ orderDetl.setOrderId(order.getId()); // 璁㈠崟鍐呯爜
orderDetl.setAnfme(dto.getCount()); // 鏁伴噺
orderDetl.setCreateBy(userId);
orderDetl.setCreateTime(now);
--
Gitblit v1.9.1