From 39eda46cbbf3ebb393c3770a5a19e923cace2a13 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 四月 2021 14:05:54 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 180 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 93 insertions(+), 87 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 9bfcfa4..d98e4c6 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.*;
@@ -38,15 +42,11 @@
@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
@@ -57,6 +57,10 @@
private ItemService itemService;
@Autowired
private CstmrService cstmrService;
+ @Autowired
+ private ErpService erpService;
+ @Autowired
+ private AsrsService asrsService;
@Override
@Transactional
@@ -127,6 +131,7 @@
if (!erpService.uploadBill(dtos, docId, docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
+
return R.ok("鍏ュ簱鎴愬姛");
}
@@ -202,31 +207,12 @@
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.getOrderNo()));
- Double total = 0.0D;
- String custName = "";
- for (Pakout pakout : pakouts) {
- total = pakout.getAnfme() + total;
- custName = pakout.getCustName();
- }
- StoPrintVo vo = new StoPrintVo();
- vo.setDocNum(param.getOrderNo());
- vo.setList(pakouts);
- vo.setTotal(total);
- vo.setCustName("娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�");
- vo.setWorkerName("闄嗘檽娑�");
- return R.ok().add(vo);
}
@Override
@@ -239,21 +225,12 @@
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
}
- OrderStoDto dto = new OrderStoDto();
- dto.setOrderNo(param.getOrderNo());
- List<MatnrDto> matnrDtos = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetls) {
- MatnrDto matnrDto = new MatnrDto();
- matnrDto.setMatnr(orderDetl.getMatnr());
- matnrDto.setCount(orderDetl.getAnfme());
- matnrDtos.add(matnrDto);
- }
- dto.setDtos(matnrDtos);
+ OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
return R.ok().add(mainService.stockOutPreview(dto));
}
@Override
- public R stockOut(StockOutParam param, Long userId) {
+ public R stockOutCreate(StockOutParam param, Long userId) {
Order order = orderService.selectByOrderNo(param.getOrderNo());
if (order.getSettle() != 1) {
return R.error("姝ゅ崟鎹棤娉曠敓鎴愭嫞璐у崟");
@@ -262,26 +239,42 @@
if (Cools.isEmpty(orderDetls)) {
return R.error("姝ゅ崟鎹凡澶辨晥锛岃鑱旂郴绠＄悊鍛�");
}
- OrderStoDto dto = new OrderStoDto();
- dto.setOrderNo(param.getOrderNo());
- List<MatnrDto> matnrDtos = new ArrayList<>();
for (OrderDetl orderDetl : orderDetls) {
- MatnrDto matnrDto = new MatnrDto();
- matnrDto.setMatnr(orderDetl.getMatnr());
- matnrDto.setCount(orderDetl.getAnfme());
- matnrDtos.add(matnrDto);
+ if (Arith.remainder(orderDetl.getAnfme(), 1) > 0) {
+ return R.error(orderDetl.getMaktx() + "鏁伴噺蹇呴』涓烘暣鏁�");
+ }
}
- dto.setDtos(matnrDtos);
+ OrderStoDto dto = new OrderStoDto().create(order.getOrderNo(), orderDetls);
// 寮�濮嬫暣鐞嗗嚭搴撴暟鎹�
mainService.stockOutProcess(dto);
return R.ok("鐢熸垚鎷ｈ揣鍗曟垚鍔�");
}
@Override
+ public R stockOutPrint(StockOutParam param, Long userId) {
+ Order order = orderService.selectByOrderNo(param.getOrderNo());
+ if (order == null) {
+ return R.error("姝ゅ崟鎹凡澶辨晥");
+ }
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", order.getOrderNo()));
+ Double total = 0.0D;
+ for (Pakout pakout : pakouts) {
+ total = pakout.getAnfme() + total;
+ }
+ StoPrintVo vo = new StoPrintVo();
+ vo.setDocNum(param.getOrderNo());
+ vo.setList(pakouts);
+ vo.setTotal(total);
+ vo.setCstmrName(order.getCstmrName());
+ vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
+ return R.ok().add(vo);
+ }
+
+ @Override
@Transactional
public R stockOutComplete(StockConfirmParam param, Long userId) {
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
- .eq("doc_num", param.getNumber())
+ .eq("doc_num", param.getOrderNo())
.in("wrk_sts", 1, 2));
for (Pakout pakout : pakouts) {
LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
@@ -350,31 +343,13 @@
}
// 淇敼鍑哄簱鍗曠姸鎬�
- if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getOrderNo(), userId)) {
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ if (!orderService.updateSettle(param.getOrderNo(), 4L)) {
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();
}
@@ -448,7 +423,7 @@
}
if (complete) {
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
+ if (!orderService.updateSettle(pakout.getDocNum(), 4L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -463,35 +438,14 @@
@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)) {
+ if (!orderService.updateSettle(pakout.getDocNum(), 3L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
}
@@ -570,6 +524,59 @@
}
return R.ok("鍒涘缓璁㈠崟鎴愬姛");
}
+
+ @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) {
@@ -773,7 +780,6 @@
if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
}
-
return R.ok();
}
--
Gitblit v1.9.1