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 | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 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();
}
--
Gitblit v1.9.1