From 7df6ab7f0cede6c1a9aa51e496f910026a4bfce6 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 十二月 2021 09:43:09 +0800
Subject: [PATCH] 2021.12.7
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 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..d13c6de 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
@@ -17,6 +17,7 @@
import zy.cloud.wms.common.service.erp.entity.*;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.mapper.MatCodeMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
@@ -35,11 +36,12 @@
@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";
public static final String UPLOAD_STOCK = "cM/basis/uploadStock";
+ public static final String GET_STOCK = "cM/ptype/GetStock";
public static final String OVER_BILL = "cM/basis/OverBill";
public static final String UPLOAD_CANCEL_RESULT = "cM/basis/cancelOrders";
@@ -63,6 +65,13 @@
private PakoutService pakoutService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private DocLogService docLogService;
+ @Autowired
+ private RequestLogService requestLogService;
+ @Autowired
+ private MatCodeMapper matCodeMapper;
+
/**
* 鍟嗗搧涓嬭浇
@@ -166,6 +175,7 @@
}
if (null == mat) {
+ // 骞充粨
mat = new Mat(
String.valueOf(data.getRec()), // 缂栧彿
null, // 鎵�灞炲尯鍩�
@@ -191,8 +201,12 @@
updateTime, // 淇敼鏃堕棿
null // 澶囨敞
);
+
matService.insert(mat);
+ // 绔嬪簱
+
} else {
+ // 骞充粨
mat.setUuid(String.valueOf(data.getRec()));
mat.setMatnr(data.getUserCode());
mat.setMaktx(data.getFullName());
@@ -201,6 +215,8 @@
mat.setBarcode(data.getBarcode());
mat.setUnit(data.getUnit3());
matService.updateById(mat);
+ // 绔嬪簱
+
}
log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
}
@@ -215,7 +231,7 @@
/**
* 鍟嗗搧涓嬭浇
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0 */2 * * * ? ")
public void updateMatExecute(){
try {
Map<String, Object> param = new HashMap<>();
@@ -227,7 +243,8 @@
.build()
.doPost();
if (!Cools.isEmpty(response)) {
-// log.info(response);
+ log.info("鍟嗗搧鏁版嵁鏇存柊锛�");
+ log.info(response);
Date now = new Date();
Result result = JSON.parseObject(response, Result.class);
if (result.getCode() != 1) {
@@ -336,7 +353,11 @@
updateTime, // 淇敼鏃堕棿
null // 澶囨敞
);
- matService.insert(mat);
+ if (matService.insert(mat)) {
+ MatCode matCode = mat.beMatCode();
+ matCodeMapper.insert(matCode);
+ }
+
} else {
mat.setUuid(String.valueOf(data.getRec()));
mat.setMatnr(data.getUserCode());
@@ -345,7 +366,10 @@
mat.setUpdateTime(updateTime);
mat.setBarcode(data.getBarcode());
mat.setUnit(data.getUnit3());
- matService.updateById(mat);
+ if (matService.updateById(mat)) {
+ MatCode matCode = mat.beMatCode();
+ matCodeMapper.updateById(matCode);
+ }
}
log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
}
@@ -423,7 +447,7 @@
/**
* 鎸佷箙鍖栭攢鍞鍗�
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0 */1 * * * ?")
@Transactional
// @PostConstruct
public void getOrdersExecute(){
@@ -544,6 +568,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 +577,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -573,6 +600,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 +622,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 +670,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 +679,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -651,10 +703,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 +725,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