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 | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 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 70e7a2f..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
@@ -239,39 +239,21 @@
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
}
- OrderStoDto dto = new OrderStoDto();
- dto.setOrderNo(param.getOrderNo());
- List<MatnrDto> matnrDtos = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetls) {
- MatnrDto matnrDto = new MatnrDto();
- matnrDto.setMatnr(orderDetl.getMatnr());
- matnrDto.setCount(orderDetl.getAnfme());
- matnrDtos.add(matnrDto);
- }
- dto.setDtos(matnrDtos);
+ 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.getOrderNo())
- .eq("status", 1)
- );
+ 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();
- dto.setOrderNo(param.getOrderNo());
- List<MatnrDto> matnrDtos = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetls) {
- MatnrDto matnrDto = new MatnrDto();
- matnrDto.setMatnr(orderDetl.getMatnr());
- matnrDto.setCount(orderDetl.getAnfme());
- matnrDtos.add(matnrDto);
- }
- dto.setDtos(matnrDtos);
+ OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
--
Gitblit v1.9.1