From 83b02c918a02f548ac5fbe189891867a00a53fc2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 13 三月 2021 14:11:59 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 99f2ab3..87d453a 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
@@ -108,6 +108,18 @@
     }
 
     @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);
+        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())
@@ -245,7 +257,7 @@
     @Override
     @Transactional
     public R initOrder(InitOrderParam param, Long userId) {
-        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber())) > 0) {
+        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber()).ne("bType_id", param.getCustomerTypeId())) > 0) {
             return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
         }
         Date now = new Date();

--
Gitblit v1.9.1