From 4d76ec2cc1cbbf9f192d532922c2d0a05900f510 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 四月 2021 11:40:23 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 insertions(+), 14 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 0c0cb46..fb302a3 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
@@ -1,6 +1,7 @@
package zy.cloud.wms.manager.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
@@ -9,10 +10,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.common.config.CodeCoolException;
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.asrs.AsrsService;
+import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
@@ -55,6 +59,8 @@
private CstmrService cstmrService;
@Autowired
private ErpService erpService;
+ @Autowired
+ private AsrsService asrsService;
@Override
@Transactional
@@ -68,6 +74,18 @@
}
if (Cools.isEmpty(param.getMats())) {
return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
+ }
+ 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;
}
Date now = new Date();
for (MatnrDto dto : param.getMats()) {
@@ -84,8 +102,8 @@
locDetl.setZpallet("");
locDetl.setAnfme(dto.getCount());
VersionUtils.setLocDetl(locDetl, mat);
-// locDetl.setDocId(param.getDocType().longValue());
-// locDetl.setDocNum(docNum);
+ locDetl.setDocId(docId.longValue());
+ locDetl.setDocNum(docNum);
locDetl.setStatus(1);
locDetl.setCreateBy(userId);
locDetl.setCreateTime(now);
@@ -109,18 +127,6 @@
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");
@@ -232,6 +238,11 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderNo(param.getOrderNo());
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
+ }
+ for (OrderDetl orderDetl : orderDetls) {
+ if (Arith.remainder(orderDetl.getAnfme(), 1) > 0) {
+ return R.error(orderDetl.getMaktx() + "鏁伴噺蹇呴』涓烘暣鏁�");
+ }
}
OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
@@ -451,6 +462,15 @@
Date now = new Date();
Item item = itemService.selectByName(param.getItem());
Cstmr cstmr = cstmrService.selectByName(param.getCstmr());
+ // 閲囪喘閫�璐у崟妫�楠�
+ if (param.getDocType() == 6) {
+ for (MatnrDto dto : param.getList()) {
+ if (locDetlService.getStockByDocType34(dto.getMatnr()) < dto.getCount()) {
+ return R.error(dto.getMatnr() + "閲囪喘閲忎笉瓒充互鐢熸垚閫�璐у崟锛�");
+ }
+ }
+ }
+
// 鏂板璁㈠崟琛ㄥご
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -515,6 +535,59 @@
}
@Override
+ public R asrsStockTransfer(AsrsTransferParam param, Long userId) {
+ if (Cools.isEmpty(param.getNode_id(), param.getMatnr(), param.getSafe_qua(), param.getAmount())) {
+ return R.error("鏁伴噺閿欒");
+ }
+ Node node = nodeService.selectById(param.getNode_id());
+ Mat mat = matService.selectByMatnr(param.getMatnr());
+ if (node == null || mat == null) {
+ return R.error();
+ }
+ double anfme = Arith.subtract(2, param.getSafe_qua(), param.getAmount());
+ List<StockTransferParam> params = new ArrayList<>();
+ StockTransferParam transferParam = new StockTransferParam();
+ transferParam.setMatnr(param.getMatnr());
+ transferParam.setAnfme(anfme);
+ transferParam.setAllotNo(param.getNode_id()+ "_" +param.getMatnr());
+ params.add(transferParam);
+ Result1 result = asrsService.stockTransfer(params);
+ if (result.getCode() == 500) {
+ if (Cools.isEmpty(result.getData())) {
+ throw new CoolException(result.getMsg());
+ } else {
+ throw new CodeCoolException("20001-" + result.getData());
+ }
+ }
+ // 鐩存帴澧炲姞搴撳瓨
+ LocDetl locDetl = locDetlService.getLocDetl(param.getNode_id(), param.getMatnr());
+ if (locDetl == null) {
+ // 鏇存柊璐т綅搴撳瓨鏄庣粏
+ locDetl = new LocDetl();
+ locDetl.setLocNo(node.getName());
+ locDetl.setNodeId(node.getId());
+ locDetl.setAnfme(anfme);
+ VersionUtils.setLocDetl(locDetl, mat);
+ locDetl.setStatus(1);
+ locDetl.setCreateBy(userId);
+ locDetl.setCreateTime(new Date());
+ locDetl.setUpdateBy(userId);
+ locDetl.setUpdateTime(new Date());
+ boolean insert = locDetlService.insert(locDetl);
+ if (!insert) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ } else {
+ if (!locDetlService.incrementStock(node.getId(), param.getMatnr(), anfme)) {
+ throw new CoolException("鏂板搴撳瓨鏄庣粏妗ｅけ璐�");
+ }
+ }
+
+ return R.ok("琛ヤ粨鎴愬姛锛岀瓑寰呯珛搴撹皟鎷�");
+ }
+
+
+ @Override
public R stockCheck(StoCheckParam param, Long userId) {
if (Cools.isEmpty(param.getLocNo())) {
return R.error("璇烽�夋嫨璐т綅");
--
Gitblit v1.9.1