From 454e10394b27f49b21e808bb2a5f30ffc91c2240 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 三月 2021 10:00:15 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 92 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 92 insertions(+), 0 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 dec1993..2160384 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
@@ -9,14 +9,18 @@
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.*;
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.List;
@@ -42,6 +46,10 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private MatService matService;
+ @Autowired
+ private AsrsService asrsService;
+ @Autowired
+ private ErpService erpService;
@Override
@Transactional
@@ -55,6 +63,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);
@@ -73,6 +92,8 @@
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);
@@ -90,6 +111,19 @@
}
}
+
+ // 涓婃姤缁檈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();
}
@@ -170,6 +204,21 @@
// 淇敼鍗曟嵁鐘舵��
if (!custOrderService.updateStatus(param.getNumber(), 4)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
+ // 閲囪喘閫�璐у崟
+ if (param.getNumber().startsWith("PR-")) {
+ List<BillDto> dtos = new ArrayList<>();
+ for (Pakout pakout : pakouts) {
+ BillDto billDto = new BillDto();
+ billDto.setMatnr(pakout.getMatnr());
+ billDto.setQty(pakout.getAnfme());
+ dtos.add(billDto);
+ }
+ // erp鍗曟嵁涓婁紶 -- 閲囪喘閫�璐у崟
+ if (!erpService.uploadBill(dtos, 6, pakouts.get(0).getDocNum())) {
+ throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+ }
+
}
return R.ok();
}
@@ -313,6 +362,7 @@
null, // 缁忔墜浜虹紪鍙穂绌篯
dto.getMatnr(), // 鍟嗗搧缂栧彿
dto.getCount(), // 鍟嗗搧鏁伴噺
+ dto.getCount(), // 鎬绘暟閲�
Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()), // 鍟嗗搧鍗曚环
null, // 鍟嗗搧澶囨敞[绌篯
1, // 鐘舵��
@@ -327,4 +377,46 @@
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) {
+
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1