From fb8d2664da608d1cb1895c483b904c258f3b171d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 13:52:40 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 731 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 703 insertions(+), 28 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 047063b..399e9f0 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,36 +3,132 @@
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.model.BillDto;
+import zy.cloud.wms.common.model.MatnrDto;
+import zy.cloud.wms.common.model.OrderStoDto;
+import zy.cloud.wms.common.service.MainService;
+import zy.cloud.wms.common.service.erp.ErpService;
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.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.*;
+import zy.cloud.wms.manager.entity.param.*;
+import zy.cloud.wms.manager.entity.result.StoPrintVo;
+import zy.cloud.wms.manager.service.*;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2021/2/25
*/
+@Slf4j
@Service("workService")
public class WorkServiceImpl implements WorkService {
+ @Autowired
+ private MainService mainService;
@Autowired
private NodeService nodeService;
@Autowired
private CombService combService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private CustOrderService custOrderService;
+ @Autowired
+ private PakoutService pakoutService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private MatService matService;
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private CheckService checkService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private ItemService itemService;
+ @Autowired
+ private CstmrService cstmrService;
+
+ @Override
+ @Transactional
+ public R stockPakin(PakinParam param, Long userId) {
+ Node node = nodeService.selectByUuid(param.getNodeId());
+ if (node == null) {
+ node = nodeService.selectById(param.getNodeId());
+ }
+ if (node == null) {
+ return R.error("璐т綅涓嶅瓨鍦�");
+ }
+ if (Cools.isEmpty(param.getMats())) {
+ return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
+ }
+ Date now = new Date();
+ for (MatnrDto dto : param.getMats()) {
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ if (mat == null) {
+ throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr());
+ if (locDetl == null) {
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ locDetl = new LocDetl();
+ locDetl.setLocNo(node.getName());
+ locDetl.setNodeId(node.getId());
+ locDetl.setZpallet("");
+ locDetl.setAnfme(dto.getCount());
+ VersionUtils.setLocDetl(locDetl, mat);
+// locDetl.setDocId(param.getDocType().longValue());
+// locDetl.setDocNum(docNum);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(now);
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(now);
+ boolean insert = locDetlService.insert(locDetl);
+ if (!insert) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ if (!locDetlService.incrementStock(node.getId(), dto.getMatnr(), dto.getCount())) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ }
+ }
+
+ // 涓婃姤缁檈rp
+ List<BillDto> dtos = new ArrayList<>();
+ for (MatnrDto dto : param.getMats()) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(dto.getMatnr());
+ billDto.setQty(dto.getCount());
+ dtos.add(billDto);
+ }
+ Integer docId = Optional.ofNullable(param.getDocType()).orElse(34);
+ String docNum = String.valueOf(snowflakeIdWorker.nextId());
+ switch (docId) {
+ case 34: // 閲囪喘鍗�
+ docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ case 45: // 閿�鍞��璐у崟
+ docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ default:
+ break;
+ }
+ if (!erpService.uploadBill(dtos, docId, docNum)) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+ return R.ok("鍏ュ簱鎴愬姛");
+ }
@Override
@Transactional
@@ -46,6 +142,17 @@
return R.error("鐗╂枡涓嶅瓨鍦�");
}
Date now = new Date();
+ String docNum = String.valueOf(snowflakeIdWorker.nextId());
+ switch (param.getDocType()) {
+ case 34: // 閲囪喘鍗�
+ docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ case 45: // 閿�鍞��璐у崟
+ docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ break;
+ default:
+ break;
+ }
for (Comb comb : combs) {
// 鏀瑰彉缁勬墭妗ｇ姸鎬�
comb.setIoStatus(4);
@@ -55,29 +162,597 @@
if (!update) {
throw new CoolException("淇敼鎵樼洏璧勬枡妗ｅけ璐�");
}
- // 鏇存柊璐т綅搴撳瓨鏄庣粏
- LocDetl locDetl = new LocDetl();
- locDetl.setLocNo(node.getName());
- locDetl.setNodeId(node.getId());
- locDetl.setZpallet(param.getZpallet());
- locDetl.setAnfme(comb.getAnfme());
- VersionUtils.setLocDetl(locDetl, comb);
- locDetl.setStatus(1);
- locDetl.setCreateBy(userId);
- locDetl.setCreateTime(now);
- locDetl.setUpdateBy(userId);
- locDetl.setUpdateTime(now);
- boolean insert = locDetlService.insert(locDetl);
- if (!insert) {
- throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ LocDetl locDetl = locDetlService.getLocDetl(node.getId(), comb.getMatnr());
+ if (locDetl == null) {
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ locDetl = new LocDetl();
+ locDetl.setLocNo(node.getName());
+ locDetl.setNodeId(node.getId());
+ locDetl.setZpallet(param.getZpallet());
+ locDetl.setAnfme(comb.getAnfme());
+ VersionUtils.setLocDetl(locDetl, comb);
+ locDetl.setDocId(param.getDocType().longValue());
+ locDetl.setDocNum(docNum);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(now);
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(now);
+ boolean insert = locDetlService.insert(locDetl);
+ if (!insert) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+
+ }
+
+ }
+
+ // 涓婃姤缁檈rp
+ List<BillDto> dtos = new ArrayList<>();
+ for (Comb comb : combs) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(comb.getMatnr());
+ billDto.setQty(comb.getAnfme());
+ dtos.add(billDto);
+ }
+ if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public R stockOutCheck(String number, Long userId) {
+ return null;
+ }
+
+ @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);
+ }
+
+ @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())
+ .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) {
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
+ .eq("doc_num", param.getNumber())
+ .in("wrk_sts", 1, 2));
+ for (Pakout pakout : pakouts) {
+ LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
+ // 缂鸿揣 or 绔嬪簱
+ if (locDetl == null) {
+ // 缂鸿揣
+ if (pakout.getLocNo().equals("缂鸿揣")) {
+ Double count = Optional.ofNullable(locDetlService.selectCountByMatnr(pakout.getMatnr())).orElse(0.0D);
+ if (count < pakout.getAnfme()) {
+ throw new CoolException(pakout.getMaktx()+"缂鸿揣");
+ }
+ Date now = new Date();
+ // 鏌ユ壘鎺ㄨ崘璐т綅鏄惁搴撳瓨瓒冲
+ List<LocDetl> locDetls = locDetlService.findOfSort(pakout.getMatnr());
+ double issued = Optional.ofNullable(pakout.getAnfme()).orElse(0.0D) ;
+ for (LocDetl locDetl1 : locDetls) {
+ if (issued > 0) {
+ // 淇濆瓨鍑哄簱閫氱煡鍗�
+ Pakout newPakout = new Pakout();
+ newPakout.setWrkSts(3L);
+ newPakout.setAnfme(issued>=locDetl1.getAnfme()?locDetl1.getAnfme():issued);
+ newPakout.setZpallet(locDetl1.getZpallet());
+ newPakout.setLocNo(locDetl1.getLocNo());
+ newPakout.setNodeId(locDetl1.getNodeId());
+ newPakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(newPakout, locDetl1);
+ newPakout.setDocId(pakout.getDocId()); // 鍗曟嵁绫诲瀷
+ newPakout.setDocNum(pakout.getDocNum()); // 鍗曟嵁缂栧彿
+ newPakout.setCreateTime(now);
+ newPakout.setUpdateTime(now);
+ newPakout.setStatus(1);
+ if (!pakoutService.insert(newPakout)) {
+ throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
+ }
+ if (issued>=locDetl1.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl1.getNodeId(), newPakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl1.getNodeId(), newPakout.getMatnr(), issued)) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl1.getAnfme();
+ }
+ }
+
+ }
+ continue;
+ }
+ // 淇敼搴撳瓨鏁伴噺
+ if (pakout.getAnfme()>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ }
+
+ // 淇敼鍑哄簱鍗曠姸鎬�
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ return R.error("淇濆瓨鏁版嵁澶辫触");
+ }
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ // 閲囪喘閫�璐у崟
+// if (param.getNumber().startsWith("PR-")) {
+ // erp鍗曟嵁涓婁紶 todo
+// Long docId = pakouts.get(0).getDocId();
+// if (null != docId) {
+// List<BillDto> dtos = new ArrayList<>();
+// for (Pakout pakout : pakouts) {
+// BillDto billDto = new BillDto();
+// billDto.setMatnr(pakout.getMatnr());
+// billDto.setQty(pakout.getAnfme());
+// dtos.add(billDto);
+// }
+// if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) {
+// throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+// }
+// }
+
+// }
+ 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 stockOut(StockOutParam param, Long userId) {
- return null;
+ @Transactional
+ public R completePakout(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 (pakout.getAnfme()>=locDetl.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl.getNodeId(), pakout.getMatnr(), pakout.getAnfme())) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 淇敼鎷ｈ揣鍗曠姸鎬�
+ if (pakoutService.stockOutComplete(wrkNo, null, userId)) {
+
+ boolean complete = true;
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ for (Pakout item : pakouts) {
+ if (item.getWrkSts() != 3) {
+ complete = false;
+ break;
+ }
+ }
+ if (complete) {
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+
+ 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("鍒犻櫎鎷ｈ揣鍗曞け璐�");
+ }
+
+ // 鍙栨秷閿�鍞鍗�
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
+ if (Cools.isEmpty(pakouts)){
+ // 淇敼鍗曟嵁鐘舵��
+ if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ }
+ return R.ok("鎷ｈ揣鍗曞凡鍙栨秷");
+ }
+
+ @Override
+ @Transactional
+ public R initOrder(InitOrderParam param, Long userId) {
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order != null) {
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�");
+ }
+ Date now = new Date();
+ Item item = itemService.selectByName(param.getItem());
+ Cstmr cstmr = cstmrService.selectByName(param.getCstmr());
+ // 鏂板璁㈠崟琛ㄥご
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栧彿
+ param.getOrderTime(), // 鍗曟嵁鏃ユ湡
+ param.getDocType(), // 鍗曟嵁绫诲瀷
+ item==null?null:item.getId(), // 椤圭洰缂栧彿
+ param.getItem(), // 椤圭洰鍚嶇О
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ cstmr==null?null:cstmr.getId(), // 瀹㈡埛缂栧彿
+ param.getCstmr(), // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ null, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("淇濆瓨璁㈠崟琛ㄥご澶辫触锛�");
+ }
+ // 閬嶅巻鍟嗗搧鏁伴噺骞朵繚瀛�
+ for (MatnrDto dto : param.getList()){
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ if (mat == null) {
+ log.error("{}鍟嗗搧涓嶅瓨鍦ㄣ��", dto.getMatnr());
+ continue;
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.setOrderId(order.getId()); // 璁㈠崟鍐呯爜
+ orderDetl.setAnfme(dto.getCount()); // 鏁伴噺
+ orderDetl.setCreateBy(userId);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(userId);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ VersionUtils.setOrderDetl(orderDetl, mat);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("淇濆瓨璁㈠崟鏄庣粏澶辫触");
+ }
+ }
+ return R.ok("鍒涘缓璁㈠崟鎴愬姛");
+ }
+
+ @Override
+ public R stockCheck(StoCheckParam param, Long userId) {
+ if (Cools.isEmpty(param.getLocNo())) {
+ return R.error("璇烽�夋嫨璐т綅");
+ }
+ Node node = nodeService.selectByUuid(param.getLocNo());
+ if (Cools.isEmpty(node)) {
+ return R.error("璐т綅寮傚父,璇疯仈绯荤鐞嗗憳");
+ }
+ // 鍑嗗鏁版嵁
+ Date now = new Date();
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("node_id", node.getId()));
+ List<String> locDetlMatnrs = new ArrayList<>();
+ locDetls.forEach(locDetl -> locDetlMatnrs.add(locDetl.getMatnr()));
+ Iterator<LocDetl> detlIterator = locDetls.iterator();
+ List<PakinMatDto> dtos = param.getDtos();
+
+ // 1.鐩堜簭 淇敼鏁伴噺
+ while (detlIterator.hasNext()){
+ LocDetl locDetl = detlIterator.next();
+ for (PakinMatDto dto : dtos) {
+ if (locDetl.getMatnr().equals(dto.getMatnr())) {
+ if (!locDetl.getAnfme().equals(dto.getCount())) {
+ Check check = new Check(
+ String.valueOf(snowflakeIdWorker.nextId()), // 鐩樼偣缂栧彿
+ node.getId(), // 鐩樼偣璐т綅
+ node.getUuid(), // 璐т綅缂栧彿
+ node.getName(), // 璐т綅鍚嶇О
+ locDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ locDetl.getMaktx(), // 鍟嗗搧鍚嶇О
+ locDetl.getUnit(), // 鍗曚綅
+ null, // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁缂栧彿
+ locDetl.getAnfme(), // 璐﹂潰鏁伴噺
+ dto.getCount(), // 瀹炵洏鏁伴噺
+ dto.getCount() - locDetl.getAnfme(), // 宸��
+ locDetl.getAnfme() < dto.getCount() ? 1 : 2, // 鐩堜簭
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!checkService.insert(check)) {
+ throw new CoolException("淇濆瓨鐩樼偣璁板綍澶辫触");
+ }
+ }
+ detlIterator.remove();
+ break;
+ }
+ }
+ }
+
+ // 2.鐩樹簭 鍒犻櫎搴撳瓨
+ for (LocDetl locDetl : locDetls) {
+ Check check = new Check(
+ String.valueOf(snowflakeIdWorker.nextId()), // 鐩樼偣缂栧彿
+ node.getId(), // 鐩樼偣璐т綅
+ node.getUuid(), // 璐т綅缂栧彿
+ node.getName(), // 璐т綅鍚嶇О
+ locDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ locDetl.getMaktx(), // 鍟嗗搧鍚嶇О
+ locDetl.getUnit(), // 鍗曚綅
+ null, // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁缂栧彿
+ locDetl.getAnfme(), // 璐﹂潰鏁伴噺
+ 0D, // 瀹炵洏鏁伴噺
+ 0D - locDetl.getAnfme(), // 宸��
+ 2, // 鐩堜簭
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!checkService.insert(check)) {
+ throw new CoolException("淇濆瓨鐩樼偣璁板綍澶辫触");
+ }
+
+ }
+
+ // 3.鐩樼泩 鏂板搴撳瓨
+ for (PakinMatDto dto : dtos) {
+ if (!locDetlMatnrs.contains(dto.getMatnr())) {
+ Mat mat = matService.selectByMatnr(dto.getMatnr());
+ Check check = new Check(
+ String.valueOf(snowflakeIdWorker.nextId()), // 鐩樼偣缂栧彿
+ node.getId(), // 鐩樼偣璐т綅
+ node.getUuid(), // 璐т綅缂栧彿
+ node.getName(), // 璐т綅鍚嶇О
+ mat.getMatnr(), // 鍟嗗搧缂栧彿
+ mat.getMaktx(), // 鍟嗗搧鍚嶇О
+ mat.getUnit(), // 鍗曚綅
+ null, // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁缂栧彿
+ 0D, // 璐﹂潰鏁伴噺
+ dto.getCount(), // 瀹炵洏鏁伴噺
+ dto.getCount() - 0D, // 宸��
+ 1, // 鐩堜簭
+ 1, // 鐘舵��
+ userId, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ userId, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!checkService.insert(check)) {
+ throw new CoolException("淇濆瓨鐩樼偣璁板綍澶辫触");
+ }
+
+ }
+ }
+ return R.ok();
+ }
+
+ @Override
+ @Transactional
+ public R stockCheckAuditing(Long checkId, Long userId) {
+ Check check = checkService.selectById(checkId);
+ if (null == check) {
+ return R.error("鐩樼偣璁板綍宸插け鏁�");
+ }
+ Date now = new Date();
+ // 1.淇敼搴撳瓨鏁伴噺
+ if (check.getOriQty() != 0 && check.getCekQty() != 0) {
+ // 鏇存柊搴撳瓨鏄庣粏
+ if (check.getSettle() == 1) {
+ if (!locDetlService.incrementStock(check.getNodeId(), check.getMatnr(), Math.abs(check.getDiffQty()))) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ } else if (check.getSettle() == 2) {
+ if (!locDetlService.reduceStock(check.getNodeId(), check.getMatnr(), Math.abs(check.getDiffQty()))) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ }
+
+ // 2.鍒犻櫎搴撳瓨
+ if (check.getOriQty() != 0 && check.getCekQty() == 0) {
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("node_id", check.getNodeId()).eq("matnr", check.getMatnr()))) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+
+ // 3.鏂板搴撳瓨
+ if (check.getOriQty() == 0 && check.getCekQty() != 0) {
+ Mat mat = matService.selectByMatnr(check.getMatnr());
+ if (mat == null) {
+ throw new CoolException("鍟嗗搧鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ LocDetl locDetl = new LocDetl();
+ locDetl.setLocNo(check.getLocNo());
+ locDetl.setNodeId(check.getNodeId());
+// locDetl.setZpallet(param.getZpallet());
+ locDetl.setAnfme(check.getCekQty());
+ VersionUtils.setLocDetl(locDetl, mat);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(now);
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(now);
+ if (!locDetlService.insert(locDetl)) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏澶辫触");
+ }
+ }
+
+ // 淇敼鐩樼偣璁板綍
+ String docNum = null;
+ Long docId = null;
+ switch (check.getSettle()) {
+ case 1: // 鐩樼泩
+ docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 14L; // 鎶ユ孩鍗�
+ break;
+ case 2: // 鐩樹簭
+ docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 9L; // 鎶ユ崯鍗�
+ break;
+ default:
+ throw new CoolException("鐩樼偣璁板綍鐩堜簭鎯呭喌寮傚父");
+ }
+ check.setStatus(2);
+ check.setDocId(docId);
+ check.setDocNum(docNum);
+ check.setUpdateBy(userId);
+ check.setUpdateTime(now);
+ if (!checkService.updateById(check)) {
+ throw new CoolException("淇敼鐩樼偣璁板綍鐘舵�佸け璐�");
+ }
+
+ // 涓婃姤缁檈rp
+ List<BillDto> dtos = new ArrayList<>();
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(check.getMatnr());
+ billDto.setQty(Math.abs(check.getDiffQty()));
+ dtos.add(billDto);
+ if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+
+ return R.ok();
}
}
--
Gitblit v1.9.1