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/webapp/static/js/ioWorks/stockOut.js | 5 --
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 54 +++++++++++++++++++++------
src/main/java/zy/cloud/wms/common/service/MainService.java | 25 +++++++-----
3 files changed, 57 insertions(+), 27 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 21fc4ae..01cf71f 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -112,23 +112,22 @@
return;
}
Date now = new Date();
+
+ /******************************* 绔嬪簱鎷ｈ揣鍗� ********************************/
// 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
if (!Cools.isEmpty(transferParams)) {
-
-// // 鏌ョ湅绔嬪簱搴撳瓨
+ // 鏌ョ湅绔嬪簱搴撳瓨
Result1 result = asrsService.stockTransfer(transferParams);
if (result.getCode() == 500) {
if (Cools.isEmpty(result.getData())) {
throw new CodeCoolException(result.getMsg());
} else {
- throw new CodeCoolException("20001-" + String.valueOf(result.getData()));
+ throw new CodeCoolException("20001-" + result.getData());
}
-
}
if (result.getCode() == 200) {
- List<PakoutVo> res = (List<PakoutVo>) result.getData();
- for (PakoutVo vo : res) {
+ for (PakoutVo vo : result.getData()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(vo.getMatnr());
if (null == mat) {
@@ -142,7 +141,7 @@
pakout.setNodeId(-1L);
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
-// pakout.setDocId(custOrder.getBTypeId());
+ pakout.setDocId(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
pakout.setDocNum(dto.getNumber()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
@@ -154,8 +153,8 @@
}
}
-// // 妫�鏌ュ簱瀛樻槸鍚﹁冻澶�
-// locDetlService.checkLocDetlCount(dto.getNumber());
+
+ /******************************* 骞充粨鎷ｈ揣鍗� ********************************/
for (CustOrder custOrder : dto.getCustOrders()) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -176,7 +175,7 @@
pakout.setNodeId(locDetl.getNodeId());
pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
VersionUtils.setPakout(pakout, mat);
-// pakout.setDocId(custOrder.getBTypeId());
+ pakout.setDocId(getDocId(dto.getNumber())); // 鍗曟嵁绫诲瀷
pakout.setDocNum(custOrder.getNumber()); // 鍗曟嵁缂栧彿
pakout.setCreateTime(now);
pakout.setUpdateTime(now);
@@ -206,5 +205,11 @@
}
}
+ private Long getDocId(String number) {
+ if (number.startsWith("PR")) {
+ return 6L;
+ }
+ return 11L;
+ }
}
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 99df66d..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
@@ -209,20 +209,23 @@
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");
+// 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();
}
@@ -585,12 +588,39 @@
}
// 淇敼鐩樼偣璁板綍
+ 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();
}
diff --git a/src/main/webapp/static/js/ioWorks/stockOut.js b/src/main/webapp/static/js/ioWorks/stockOut.js
index c75102a..bbdc8d6 100644
--- a/src/main/webapp/static/js/ioWorks/stockOut.js
+++ b/src/main/webapp/static/js/ioWorks/stockOut.js
@@ -45,11 +45,6 @@
if (data.length === 0){
layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
} else {
- // var staNo = $("#staNoSelect").val();
- // if (staNo === "" || staNo === null){
- // layer.msg("璇烽�夋嫨鍑哄簱鍙�");
- // return;
- // }
var locDetls = [];
data.forEach(function(elem) {
locDetls.push({nodeId: elem.nodeId, matnr: elem.matnr, count: elem.count});
--
Gitblit v1.9.1