From 6a1173f27140d908513aef29f6d7240a452edb17 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 12 三月 2021 08:32:34 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 129 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 3 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 63d82ba..97e3447 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 @@ -2,7 +2,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; +import com.core.common.DateUtils; 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; @@ -11,9 +13,7 @@ import zy.cloud.wms.common.service.MainService; import zy.cloud.wms.common.utils.VersionUtils; import zy.cloud.wms.manager.entity.*; -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.entity.param.*; import zy.cloud.wms.manager.entity.result.StoPrintVo; import zy.cloud.wms.manager.service.*; @@ -38,6 +38,10 @@ private CustOrderService custOrderService; @Autowired private PakoutService pakoutService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private MatService matService; @Override @Transactional @@ -88,9 +92,18 @@ @Override 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); } @@ -120,4 +133,114 @@ 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("鐢熸垚鎷h揣鍗曞け璐�"); + } + 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("鎷h揣鍗曞凡瀹屾垚"); + } + } + 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("鎷h揣鍗曞凡澶辨晥锛屽彇娑堝け璐ワ紒"); + } + if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) { + throw new CoolException("鍒犻櫎鎷h揣鍗曞け璐�"); + } + return R.ok("鎷h揣鍗曞凡鍙栨秷"); + } + + @Override + @Transactional + public R initOrder(InitOrderParam param, Long userId) { + Date now = new Date(); + for (PakinMatDto dto : param.getList()){ + Mat mat = matService.selectByMatnr(dto.getMatnr()); + if (mat == null) { + continue; + } + CustOrder custOrder = new CustOrder( + param.getNumber(), // 閿�鍞崟鍙� + DateUtils.convert(now), // 鍗曟嵁鏃ユ湡[闈炵┖] + param.getCustomerTypeId(), // 瀹㈡埛缂栧彿 + null, // 缁忔墜浜虹紪鍙穂绌篯 + dto.getMatnr(), // 鍟嗗搧缂栧彿 + dto.getCount(), // 鍟嗗搧鏁伴噺 + Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()), // 鍟嗗搧鍗曚环 + null, // 鍟嗗搧澶囨敞[绌篯 + 1, // 鐘舵�� + now, // 娣诲姞鏃堕棿 + now, // 淇敼鏃堕棿 + null // 澶囨敞 + ); + if (!custOrderService.insert(custOrder)) { + throw new CoolException("淇濆瓨閿�鍞鍗曞け璐�"); + } + } + return R.ok("鐢熸垚閿�鍞鍗�" + param.getNumber() + "鎴愬姛"); + } + } -- Gitblit v1.9.1