From 52705aa4ae95014eea7ee66d1eb29b9001671d98 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:16:23 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 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 454d4d0..6a537e9 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
@@ -11,8 +11,10 @@
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
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.DocTypeService;
import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.service.RequestLogService;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.util.ArrayList;
@@ -30,20 +32,19 @@
private DocTypeService docTypeService;
@Autowired
private MatService matService;
+ @Autowired
+ private RequestLogService requestLogService;
/**
* 鍗曟嵁涓婃姤
*/
- public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
- if (true) {
-// return true;
- }
+ public ErpR uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
try {
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);
}
UploadBill uploadBill = new UploadBill();
@@ -69,7 +70,7 @@
detl.setUnit(mat==null?"鏆傛棤":mat.getUnit());
detail.add(detl);
}
- System.out.println(JSON.toJSONString(uploadBill));
+ log.warn(JSON.toJSONString(uploadBill));
String response = new HttpHandler.Builder()
.setUri(ErpScheduler.URI)
.setPath(ErpScheduler.UPLOAD_BILL)
@@ -77,18 +78,31 @@
.build()
.doPost();
+ try {
+ // 鏃ュ織璁板綍
+ RequestLog logInfo = new RequestLog();
+ logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
+ logInfo.setRequest(JSON.toJSONString(uploadBill)); // 鍏ュ弬
+ logInfo.setResponse(response); // 鍑哄弬
+ logInfo.setCreateTime(new Date());
+ requestLogService.insert(logInfo);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+
+
if (!Cools.isEmpty(response)) {
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