From 19cc3dd00a9ab315181920fafa7ee86658c6bb42 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 14:54:49 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 23 +++++++++++++++--------
src/main/java/zy/cloud/wms/common/service/MainService.java | 6 ++----
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index c5f3b5d..e26ea1f 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -45,6 +45,8 @@
if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
return;
}
+ // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
+ locDetlService.checkLocDetlCount(dto.getNumber());
Date now = new Date();
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
@@ -80,10 +82,6 @@
issued = issued - locDetl.getAnfme();
}
}
-
-
-
-
}
}
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 7f2c08a..79b124b 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
@@ -7,17 +7,16 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.Comb;
+import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Node;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
-import zy.cloud.wms.manager.service.CombService;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.NodeService;
-import zy.cloud.wms.manager.service.WorkService;
+import zy.cloud.wms.manager.service.*;
import java.util.Date;
import java.util.List;
@@ -36,6 +35,8 @@
private CombService combService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private CustOrderService custOrderService;
@Override
@Transactional
@@ -85,10 +86,16 @@
@Override
public R stockOut(StockOutParam param, Long userId) {
- // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- locDetlService.checkLocDetlCount(param.getNumber());
-
- return null;
+ 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);
+ // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
+ mainService.stockOutProcess(dto);
+ return R.ok();
}
}
--
Gitblit v1.9.1