From c896f3772135806315c9d254816430fad9b82561 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 三月 2021 10:55:30 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 144 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 11 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 7f2c08a..7266714 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
@@ -3,21 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
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.LocDetl;
-import zy.cloud.wms.manager.entity.Node;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.entity.param.InitPakoutParam;
+import zy.cloud.wms.manager.entity.param.StockConfirmParam;
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.entity.result.StoPrintVo;
+import zy.cloud.wms.manager.service.*;
import java.util.Date;
import java.util.List;
@@ -36,6 +36,12 @@
private CombService combService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private CustOrderService custOrderService;
+ @Autowired
+ private PakoutService pakoutService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Override
@Transactional
@@ -84,11 +90,127 @@
}
@Override
- public R stockOut(StockOutParam param, Long userId) {
- // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
- locDetlService.checkLocDetlCount(param.getNumber());
+ public R stockOutPrint(StockOutParam param, Long userId) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", param.getNumber()));
+ Double total = 0.0D;
+ String custName = "";
+ for (Pakout pakout : pakouts) {
+ total = pakout.getAnfme() + total;
+ custName = pakout.getCustName();
+ }
+ StoPrintVo vo = new StoPrintVo();
+ vo.setDocNum(param.getNumber());
+ vo.setList(pakouts);
+ vo.setTotal(total);
+ vo.setCustName("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
+ vo.setWorkerName("闄嗘檽娑�");
+ return R.ok().add(vo);
+ }
- return null;
+ @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);
+ // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
+ mainService.stockOutProcess(dto);
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R stockOutComplete(StockConfirmParam param, Long userId) {
+ // 淇敼鍑哄簱鍗曠姸鎬�
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ return R.error("淇濆瓨鏁版嵁澶辫触");
+ }
+ // todo锛氫慨鏀瑰簱瀛樻暟閲�
+
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R initPakout(List<InitPakoutParam> params, Long userId) {
+ if (!Cools.isEmpty(params)) {
+ Date now = new Date();
+ for (InitPakoutParam param : params) {
+ LocDetl locDetl = locDetlService.getLocDetl(param.getNodeId(), param.getMatnr());
+ // 淇濆瓨鍑哄簱閫氱煡鍗�
+ Pakout pakout = new Pakout();
+ pakout.setWrkSts(1L);
+ pakout.setAnfme(param.getCount());
+ pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(pakout, locDetl);
+ pakout.setCreateTime(now);
+ pakout.setCreateBy(userId);
+ pakout.setUpdateTime(now);
+ pakout.setUpdateBy(userId);
+ pakout.setStatus(1);
+ if (!pakoutService.insert(pakout)) {
+ throw new CoolException("鐢熸垚鎷ｈ揣鍗曞け璐�");
+ }
+ if (param.getCount() > locDetl.getAnfme()) {
+ throw new CoolException("搴撳瓨涓嶈冻");
+ } else if (param.getCount()<locDetl.getAnfme()) {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), param.getMatnr(), param.getCount())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ } else {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), param.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ }
+ }
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R completePakout(String wrkNo, Long userId) {
+ Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
+ if (null != pakout) {
+ if (pakoutService.stockOutComplete(wrkNo, null, userId)) {
+ return R.ok("鎷ｈ揣鍗曞凡瀹屾垚");
+ }
+ }
+ return R.error();
+ }
+
+ @Override
+ @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("鍒犻櫎鎷ｈ揣鍗曞け璐�");
+ }
+ return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
}
}
--
Gitblit v1.9.1