From 2b38e9c64ce9d6b6b054d1540ccd53a9d1bba30a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 11:23:28 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 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 64c8002..387f582 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
@@ -5,15 +5,18 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import zy.cloud.wms.common.service.MainService;
+import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.service.erp.entity.GetDataResult;
-import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.entity.CustOrder;
+import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.io.IOException;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* erp浠诲姟鎺у埗鍣�
@@ -27,14 +30,13 @@
public static final String GET_ORDERS = "cM/basis/getOrders";
@Autowired
- private MatService matService;
- @Autowired
- private MainService mainService;
+ private CustOrderService custOrderService;
/**
- * 鍘熸潗鏂�
+ * 鎸佷箙鍖栭攢鍞鍗�
*/
// @Scheduled(cron = "0/3 * * * * ? ")
+ @Transactional
public void getOrdersExecute(){
try {
Map<String, Object> json = new HashMap<>();
@@ -49,11 +51,42 @@
log.error("璇锋眰锛歿}\nError锛屽搷搴旂粨鏋滀负绌�!", URI + GET_ORDERS);
} else {
log.info(response);
+ Date now = new Date();
Result result = JSON.parseObject(response, Result.class);
+ if (result.getCode() != 1) {
+ return;
+ }
List<GetDataResult> list = JSON.parseArray(result.getData(), GetDataResult.class);
if (!Cools.isEmpty(list)) {
- // 鐢熸垚鍑哄簱鍗�
- mainService.stockOutProcess(list);
+ boolean complete = true;
+ for (GetDataResult data : list) {
+ CustOrder custOrder = new CustOrder(
+ data.getNumber(), // 閿�鍞崟鍙�
+ data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖]
+ data.getBTypeID(), // 瀹㈡埛缂栧彿
+ data.getETypeID(), // 缁忔墜浜虹紪鍙穂闈炵┖]
+ data.getUserCode(), // 鍟嗗搧缂栧彿
+ data.getQty(), // 鍟嗗搧鏁伴噺
+ data.getPrice(), // 鍟嗗搧鍗曚环
+ data.getComment(), // 鍟嗗搧澶囨敞[闈炵┖]
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ boolean insert = custOrderService.insert(custOrder);
+ if (!insert) {
+ complete = false;
+ log.error("淇濆瓨閿�鍞鍗曞け璐ワ紒");
+ }
+ }
+ if (complete) {
+ List<String> collect = list.stream().map(GetDataResult::getNumber).distinct().collect(Collectors.toList());
+ for (String number : collect) {
+ custOrderService.completeLoading(number);
+ }
+ }
+
}
}
} catch (IOException e) {
@@ -62,4 +95,6 @@
}
+
+
}
--
Gitblit v1.9.1