From e1749547c76a5d8bae94e47d38d4d75b481610c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 09 九月 2021 10:51:15 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index 4404926..eefc7a0 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -9,9 +9,11 @@
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.entity.UploadBill;
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
+import zy.cloud.wms.manager.entity.DocLog;
import zy.cloud.wms.manager.entity.DocType;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.RequestLog;
+import zy.cloud.wms.manager.service.DocLogService;
import zy.cloud.wms.manager.service.DocTypeService;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.RequestLogService;
@@ -34,18 +36,25 @@
private MatService matService;
@Autowired
private RequestLogService requestLogService;
+ @Autowired
+ private DocLogService docLogService;
+
/**
* 鍗曟嵁涓婃姤
*/
- public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
+ public ErpR uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
try {
+ Date now = new Date();
if (Cools.isEmpty(dtos)) {
- return false;
+ return new ErpR(false, null);
}
DocType docType = docTypeService.selectById(docId);
if (Cools.isEmpty(docType)) {
- return false;
+ return new ErpR(false, null);
}
+
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
UploadBill uploadBill = new UploadBill();
uploadBill.setNumber(docNumber);
@@ -69,6 +78,18 @@
detl.setPrice(0);
detl.setUnit(mat==null?"鏆傛棤":mat.getUnit());
detail.add(detl);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ docNumber, // 鍗曟嵁缂栧彿
+ docId.longValue(), // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁鍚嶇О
+ dto.getMatnr(), // 鍟嗗搧缂栧彿
+ dto.getQty(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
log.warn(JSON.toJSONString(uploadBill));
String response = new HttpHandler.Builder()
@@ -79,9 +100,13 @@
.doPost();
try {
+ for (DocLog docLog : docLogs) {
+ docLogService.insert(docLog);
+ }
+
// 鏃ュ織璁板綍
RequestLog logInfo = new RequestLog();
- logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId.toString());
+ logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
logInfo.setRequest(JSON.toJSONString(uploadBill)); // 鍏ュ弬
logInfo.setResponse(response); // 鍑哄弬
logInfo.setCreateTime(new Date());
@@ -95,14 +120,14 @@
log.warn(response);
Result result = JSON.parseObject(response, Result.class);
if (result.getCode() != 1) {
- return false;
+ return new ErpR(false, result.getMsg());
}
}
} catch (Exception e) {
e.printStackTrace();
- return false;
+ return new ErpR(false, e.getMessage());
}
- return Boolean.TRUE;
+ return new ErpR(true, null);
}
--
Gitblit v1.9.1