From af73582c1bd3c20e2e805d4df56c111073d3fd6f Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 25 三月 2021 13:02:35 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 535 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 515 insertions(+), 20 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 b142b3d..c610d49 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,22 +2,27 @@ 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; import org.springframework.transaction.annotation.Transactional; +import zy.cloud.wms.common.model.BillDto; import zy.cloud.wms.common.model.OrderStoDto; import zy.cloud.wms.common.service.MainService; +import zy.cloud.wms.common.service.asrs.AsrsService; +import zy.cloud.wms.common.service.erp.ErpService; 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.*; +import java.util.ArrayList; import java.util.Date; +import java.util.Iterator; import java.util.List; /** @@ -38,6 +43,16 @@ private CustOrderService custOrderService; @Autowired private PakoutService pakoutService; + @Autowired + private SnowflakeIdWorker snowflakeIdWorker; + @Autowired + private MatService matService; + @Autowired + private AsrsService asrsService; + @Autowired + private ErpService erpService; + @Autowired + private CheckService checkService; @Override @Transactional @@ -51,6 +66,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) { // 鏀瑰彉缁勬墭妗g姸鎬� comb.setIoStatus(4); @@ -60,23 +86,47 @@ if (!update) { throw new CoolException("淇敼鎵樼洏璧勬枡妗eけ璐�"); } - // 鏇存柊璐т綅搴撳瓨鏄庣粏 - 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("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + 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("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } else { + if (!locDetlService.incrementStock(node.getId(), comb.getMatnr(), comb.getAnfme())) { + throw new CoolException("鏂板搴撳瓨鏄庣粏妗eけ璐�"); + } + } + } + + // 涓婃姤缁檈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(); } @@ -104,6 +154,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()) @@ -114,17 +176,450 @@ dto.setCustOrders(custOrders); // 寮�濮嬫暣鐞嗗嚭搴撴暟鎹� mainService.stockOutProcess(dto); - return R.ok(); + return R.ok("鐢熸垚鎷h揣鍗曟垚鍔�"); } @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()); + 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("淇濆瓨鏁版嵁澶辫触"); } - // todo锛氫慨鏀瑰簱瀛樻暟閲� + // 淇敼鍗曟嵁鐘舵�� + if (!custOrderService.updateStatus(param.getNumber(), 4)) { + throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�"); + } + // 閲囪喘閫�璐у崟 +// if (param.getNumber().startsWith("PR-")) { + // erp鍗曟嵁涓婁紶 + 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("鐢熸垚鎷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 + @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("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触"); + } + } + // 淇敼鎷h揣鍗曠姸鎬� + 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("鎷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揣鍗曞け璐�"); + } + + // 鍙栨秷閿�鍞鍗� + 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("鎷h揣鍗曞凡鍙栨秷"); + } + + @Override + @Transactional + public R initOrder(InitOrderParam param, Long userId) { + if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", param.getNumber()).ne("bType_id", param.getCustomerTypeId())) > 0) { + return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙�"); + } + 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(), // 鍟嗗搧鏁伴噺 + 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() + "鎴愬姛"); + } + + @Override + @Transactional + public R stockTransfer(String number, Long userId) { + List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1)); + boolean asrs = false; + List<StockTransferParam> params = new ArrayList<>(); + for (CustOrder custOrder : custOrders) { + Double count = locDetlService.selectCountByMatnr(custOrder.getUserCode()); + if (count == null) { + count = 0.0D; + } + if (count < custOrder.getQty()) { + if (!asrs) { asrs = true; } + StockTransferParam param = new StockTransferParam(); + param.setMatnr(custOrder.getUserCode()); + param.setAnfme(custOrder.getQty() - count); + params.add(param); + } + } + if (asrs) { +// if (asrsService.stockTransfer(params)) { +// for (StockTransferParam param : params) { +// // 淇敼閿�鍞鍗曞緟鍑烘暟閲� +// if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) { +// throw new CoolException("淇敼閿�鍞鍗曞緟鍑烘暟閲忓け璐�"); +// } +// } +// return R.ok("搴撳瓨璋冩嫧鎴愬姛"); +// } else { +// return R.error("绔嬪簱璋冩嫧澶辫触锛岃鑱旂郴绠$悊鍛�"); +// } + } + return R.error("鏆備笉缂鸿揣锛屼笉闇�瑕佺珛搴撹皟鎷�"); + } + + @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