From 587fcf4a73c44330a5d75ced8ccf0274666c3cbe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 三月 2021 08:17:59 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 69 +++++++---------------------------
1 files changed, 15 insertions(+), 54 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 6706377..ee72258 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
@@ -4,19 +4,20 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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.manager.entity.Cstmr;
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Mat;
-import zy.cloud.wms.manager.service.CstmrService;
-import zy.cloud.wms.manager.service.CustOrderService;
-import zy.cloud.wms.manager.service.LocDetlService;
-import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.mapper.TagMapper;
+import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
import java.io.IOException;
@@ -32,6 +33,7 @@
*/
@Slf4j
@Component
+@RestController
public class ErpScheduler {
public static final String URI = "http://8.133.182.21:8080/api";
@@ -47,11 +49,16 @@
private CstmrService cstmrService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private TagService tagService;
+ @Autowired
+ private TagMapper tagMapper;
/**
* 鍟嗗搧涓嬭浇
*/
// @Scheduled(cron = "0/5 * * * * ? ")
+ @GetMapping("/test1")
// @PostConstruct
public void getBasis1Execute(){
try {
@@ -65,56 +72,7 @@
.build()
.doPost();
if (!Cools.isEmpty(response)) {
- log.info(response);
- Date now = new Date();
- Result result = JSON.parseObject(response, Result.class);
- if (result.getCode() != 1) {
- return;
- }
- List<GetBasisResult> list = JSON.parseArray(result.getData(), GetBasisResult.class);
- for (GetBasisResult data : list) {
- Mat mat = matService.selectByMatnr(data.getUserCode());
- String modifyDate = data.getModifyDate();
- Date updateTime = null;
- if (!Cools.isEmpty(modifyDate)) {
- updateTime = DateUtils.convert(data.getModifyDate());
- }
- if (null == mat) {
- mat = new Mat(
- String.valueOf(data.getRec()), // 缂栧彿
- null, // 鎵�灞炲尯鍩�
- null, // 鎵�灞炲綊绫�
- data.getUserCode(), // 鍟嗗搧缂栧彿
- data.getFullName(), // 鍟嗗搧鍚嶇О
- null, // 鍚嶇О
- null, // 瑙勬牸
- null, // 鍨嬪彿
- null, // 鎵瑰彿
- null, // 鍗曚綅
- null, // 鏉＄爜
- null, // 鍗曟嵁绫诲瀷
- null, // 鍗曟嵁缂栧彿
- null, // 瀹㈡埛鍚嶇О
- null, // 鍝侀」鏁�
- null, // 搴撳瓨浣欓噺
- null, // 閲嶉噺
- 1, //
- null, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- null, // 淇敼浜哄憳
- updateTime, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- matService.insert(mat);
- } else {
- mat.setUuid(String.valueOf(data.getRec()));
- mat.setMatnr(data.getUserCode());
- mat.setMaktx(data.getFullName());
- mat.setUpdateTime(updateTime);
- matService.updateById(mat);
- }
- log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
- }
+
}
} catch (Exception e) {
@@ -210,6 +168,9 @@
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(), // 鍗曟嵁鏃ユ湡[闈炵┖]
--
Gitblit v1.9.1