From f0bfe3ba02dda63d4e557647baac6ac263bcb115 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 10 八月 2021 14:13:31 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 9a1378a..f1ba192 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -35,7 +35,7 @@
@RestController
public class ErpScheduler {
- public static final String URI = "http://8.133.182.21:6220/api";
+ public static final String URI = "http://123.60.34.127:6220/api";
public static final String GET_ORDERS = "cM/basis/getOrders";
public static final String GET_BASIS = "cM/basis/getBasis";
public static final String UPLOAD_BILL = "cM/basis/uploadBill";
@@ -63,6 +63,10 @@
private PakoutService pakoutService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private DocLogService docLogService;
+ @Autowired
+ private RequestLogService requestLogService;
/**
* 鍟嗗搧涓嬭浇
@@ -215,7 +219,7 @@
/**
* 鍟嗗搧涓嬭浇
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0 */2 * * * ? ")
public void updateMatExecute(){
try {
Map<String, Object> param = new HashMap<>();
@@ -423,7 +427,7 @@
/**
* 鎸佷箙鍖栭攢鍞鍗�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0 */1 * * * ?")
@Transactional
// @PostConstruct
public void getOrdersExecute(){
@@ -544,6 +548,7 @@
// @PostConstruct
public void finishOrdersExecute(){
try {
+ Date now = new Date();
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).isNotNull("number"));
if (!Cools.isEmpty(orders)) {
List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -552,6 +557,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -573,6 +580,18 @@
detl0.setUnit(orderDetl.getUnit());
detl0.setRowNo(Integer.parseInt(orderDetl.getName()));
list.add(detl0);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ order.getOrderNo(), // 鍗曟嵁缂栧彿
+ 11L, // 鍗曟嵁绫诲瀷
+ "閿�鍞鍗�", // 鍗曟嵁鍚嶇О
+ orderDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ orderDetl.getCount(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
log.warn(JSON.toJSONString(getOrderResult0));
@@ -583,23 +602,33 @@
.setJson(JSON.toJSONString(getOrderResult0))
.build()
.doPost();
+
+ try {
+ for (DocLog docLog : docLogs) {
+ docLogService.insert(docLog);
+ }
+
+ RequestLog logInfo = new RequestLog();
+ logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + 11);
+ logInfo.setRequest(JSON.toJSONString(getOrderResult0)); // 鍏ュ弬
+ 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) {
+ if (result.getCode() != 1 && !result.getMsg().equals("鍗曟嵁宸茬粡瀹℃牳瀹屾垚鎴栧垹闄わ紝涓嶈兘瀹℃牳銆�")) {
continue;
}
if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
}
-// // 杞巻鍙叉。
-// int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
-// if (save > 0) {
-// if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
-// throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
-// }
-// log.info("{}閿�鍞鍗曟嫞璐х粨鏉�", getOrderResult0.getNumber());
-// }
+
}
}
@@ -621,6 +650,7 @@
// @PostConstruct
public void finishOrders0Execute(){
try {
+ Date now = new Date();
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).eq("doc_type", 6));
if (!Cools.isEmpty(orders)) {
List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -629,6 +659,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -651,10 +683,21 @@
detl0.setUnit(orderDetl.getUnit());
detl0.setComment(orderDetl.getMemo());
list.add(detl0);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ order.getOrderNo(), // 鍗曟嵁缂栧彿
+ 6L, // 鍗曟嵁绫诲瀷
+ "閲囪喘閫�璐ц鍗�", // 鍗曟嵁鍚嶇О
+ orderDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ orderDetl.getCount(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
System.out.println(JSON.toJSONString(getOrderResult0));
-
String response = new HttpHandler.Builder()
.setUri(URI)
@@ -662,6 +705,22 @@
.setJson(JSON.toJSONString(getOrderResult0))
.build()
.doPost();
+
+ try {
+ for (DocLog docLog : docLogs) {
+ docLogService.insert(docLog);
+ }
+
+ RequestLog logInfo = new RequestLog();
+ logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + 6);
+ logInfo.setRequest(JSON.toJSONString(getOrderResult0)); // 鍏ュ弬
+ 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);
--
Gitblit v1.9.1