From 50cbaf80bdba7d23f895d9ac9c59667910150e5b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 14:49:47 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 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 5c2099e..7139fd2 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
@@ -7,12 +7,14 @@
import com.core.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.service.erp.entity.GetBasisResult;
-import zy.cloud.wms.common.service.erp.entity.GetOrderResult;
+import zy.cloud.wms.common.service.erp.entity.GetOrderResult0;
+import zy.cloud.wms.common.service.erp.entity.GetOrderResultDetl0;
import zy.cloud.wms.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Mat;
@@ -268,12 +270,13 @@
/**
* 鎸佷箙鍖栭攢鍞鍗�
*/
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/45 * * * * ? ")
@Transactional
+// @PostConstruct
public void getOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
- json.put("vchType", 41);
+ json.put("vchType", 151);
String response = new HttpHandler.Builder()
.setUri(URI)
.setPath(GET_ORDERS)
@@ -281,41 +284,48 @@
.build()
.doPost();
if (!Cools.isEmpty(response)) {
- log.info(response);
+// log.info(response);
Date now = new Date();
Result result = JSON.parseObject(response, Result.class);
if (result.getCode() != 1) {
return;
}
- List<GetOrderResult> list = JSON.parseArray(result.getData(), GetOrderResult.class);
+ List<GetOrderResult0> list = JSON.parseArray(result.getData(), GetOrderResult0.class);
if (!Cools.isEmpty(list)) {
boolean complete = true;
- for (GetOrderResult data : list) {
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", data.getNumber()).ne("bType_id", data.getBTypeID())) > 0) {
- throw new CoolException("鎶辨瓑鍗曞彿宸插瓨鍦紝璇蜂慨鏀瑰崟鍙凤細" + data.getNumber());
- }
- CustOrder custOrder = new CustOrder(
- data.getNumber(), // 閿�鍞崟鍙�
- data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖]
- data.getBTypeID(), // 瀹㈡埛缂栧彿
- data.getETypeID(), // 缁忔墜浜虹紪鍙穂闈炵┖]
- data.getUserCode(), // 鍟嗗搧缂栧彿
- data.getQty(), // 鍟嗗搧鏁伴噺
- data.getPrice(), // 鍟嗗搧鍗曚环
- data.getComment(), // 鍟嗗搧澶囨敞[闈炵┖]
- 0, // 鐘舵��
- now, // 娣诲姞鏃堕棿
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- boolean insert = custOrderService.insert(custOrder);
- if (!insert) {
+ for (GetOrderResult0 data : list) {
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>()
+ .eq("number", data.getNumber())
+// .ne("bType_id", data.getBTypeID())
+ ) > 0) {
+// log.error("{}鍗曞彿宸插瓨鍦�", data.getNumber());
complete = false;
- log.error("淇濆瓨閿�鍞鍗曞け璐ワ紒");
+ continue;
+ }
+ for (GetOrderResultDetl0 detl0 : data.getDetail()) {
+ CustOrder custOrder = new CustOrder(
+ data.getNumber(), // 閿�鍞崟鍙�
+ data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖]
+ data.getBTypeID(), // 瀹㈡埛缂栧彿
+ data.getETypeID(), // 缁忔墜浜虹紪鍙穂闈炵┖]
+ detl0.getUserCode(), // 鍟嗗搧缂栧彿
+ detl0.getQty(), // 鍟嗗搧鏁伴噺
+ detl0.getPrice(), // 鍟嗗搧鍗曚环
+ detl0.getComment(), // 鍟嗗搧澶囨敞[闈炵┖]
+ 0, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ now, // 淇敼鏃堕棿
+ data.getSummary() // 澶囨敞
+ );
+ boolean insert = custOrderService.insert(custOrder);
+ if (!insert) {
+ complete = false;
+ log.error("淇濆瓨閿�鍞鍗曞け璐ワ紒");
+ }
}
}
if (complete) {
- List<String> collect = list.stream().map(GetOrderResult::getNumber).distinct().collect(Collectors.toList());
+ List<String> collect = list.stream().map(GetOrderResult0::getNumber).distinct().collect(Collectors.toList());
for (String number : collect) {
custOrderService.updateStatus(number, 1);
}
--
Gitblit v1.9.1