From ab9bc319ccbdd5bb38cf1b6aa361391d96f7eefc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 31 三月 2021 10:12:34 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 378 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 280 insertions(+), 98 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 ee72258..f49210e 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,27 +4,25 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
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.manager.entity.Cstmr;
-import zy.cloud.wms.manager.entity.CustOrder;
-import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.common.service.erp.entity.*;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.mapper.CustOrderMapper;
import zy.cloud.wms.manager.mapper.TagMapper;
import zy.cloud.wms.manager.service.*;
import zy.cloud.wms.manager.utils.HttpHandler;
+import zy.cloud.wms.manager.utils.NodeUtils;
import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -39,6 +37,7 @@
public static final String URI = "http://8.133.182.21:8080/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";
@Autowired
@@ -53,6 +52,10 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private CustOrderMapper custOrderMapper;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
/**
* 鍟嗗搧涓嬭浇
@@ -72,11 +75,133 @@
.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);
+ Tag first = null;
+ 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());
+ }
+ // 鍒嗙被
+ Tag second = tagService.selectOne(new EntityWrapper<Tag>().eq("name", data.getYjfl()).eq("level", 2));
+ if (second == null) {
+ if (first == null) {
+ first = tagService.selectOne(new EntityWrapper<Tag>().eq("level", 1));
+ if (first == null) {
+ throw new CoolException("鍏ㄩ儴鍒嗙被鍑洪敊");
+ }
+ }
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(first.getId());
+ second = new Tag(
+ null, // 缂栧彿
+ data.getYjfl(), // 鍚嶇О
+ first.getId(), // 鐖剁骇
+ first.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 2, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(second) == 0) {
+ throw new CoolException("鎻掑叆鍒嗙被澶辫触");
+ }
+ }
+
+ Tag third = tagService.selectOne(new EntityWrapper<Tag>().eq("level", 3).eq("name", data.getEjfl()).eq("parent_name", data.getYjfl()));
+ if (third == null) {
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.executePath(second.getId());
+ third = new Tag(
+ null, // 缂栧彿
+ data.getEjfl(), // 鍚嶇О
+ second.getId(), // 鐖剁骇
+ second.getName(), // 鐖剁骇鍚嶇О
+ nodeUtils.path.toString(), // 鍏宠仈璺緞
+ nodeUtils.pathName.toString(), // 鍏宠仈璺緞鍚�
+ 0, // 绫诲瀷
+ null, // 璐熻矗浜�
+ null, // 鍥剧墖
+ null, // 绠�瑕佹弿杩�
+ null, // 鏁伴噺
+ 3, // 绛夌骇
+ null, // 鎺掑簭
+ 1, // 鐘舵��
+ now, // 娣诲姞鏃堕棿
+ null, // 娣诲姞浜哄憳
+ now, // 淇敼鏃堕棿
+ null, // 淇敼浜哄憳
+ null // 澶囨敞
+ );
+ if (tagMapper.insert(third) == 0) {
+ throw new CoolException("鎻掑叆鍒嗙被澶辫触");
+ }
+ }
+
+ if (null == mat) {
+ mat = new Mat(
+ String.valueOf(data.getRec()), // 缂栧彿
+ null, // 鎵�灞炲尯鍩�
+ third.getId(), // 鎵�灞炲綊绫�
+ data.getUserCode(), // 鍟嗗搧缂栧彿
+ data.getFullName(), // 鍟嗗搧鍚嶇О
+ null, // 鍚嶇О
+ data.getStandard(), // 瑙勬牸
+ null, // 鍨嬪彿
+ null, // 鎵瑰彿
+ data.getUnit3(), // 鍗曚綅
+ data.getBarcode(), // 鏉＄爜
+ 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.setSpecs(data.getStandard());
+ mat.setUpdateTime(updateTime);
+ mat.setBarcode(data.getBarcode());
+ mat.setUnit(data.getUnit3());
+ matService.updateById(mat);
+ }
+ log.info("====>> 鏇存柊鐗╂枡锛歿}", data.getUserCode());
+ }
}
} catch (Exception e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
}
@@ -139,18 +264,20 @@
}
} catch (Exception e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
}
/**
* 鎸佷箙鍖栭攢鍞鍗�
*/
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@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)
@@ -158,41 +285,50 @@
.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());
+ 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;
+ continue;
}
- 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) {
- complete = false;
- log.error("淇濆瓨閿�鍞鍗曞け璐ワ紒");
+ for (GetOrderResultDetl0 detl0 : data.getDetail()) {
+ CustOrder custOrder = new CustOrder(
+ data.getNumber(), // 閿�鍞崟鍙�
+ data.getBillDate(), // 鍗曟嵁鏃ユ湡[闈炵┖]
+ data.getBTypeID(), // 瀹㈡埛缂栧彿
+ data.getETypeID(), // 缁忔墜浜虹紪鍙穂闈炵┖]
+ detl0.getUserCode(), // 鍟嗗搧缂栧彿
+ detl0.getQty(), // 鍟嗗搧鏁伴噺
+ detl0.getQty(), // 鎬绘暟閲�
+ detl0.getPrice(), // 鍟嗗搧鍗曚环
+ detl0.getRowNo(), // 鍟嗗搧鏄庣粏琛屽彿
+ 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);
}
@@ -202,82 +338,128 @@
}
} catch (IOException e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
}
+ /**
+ * 瀹屾垚閿�鍞鍗�
+ */
+// @Scheduled(cron = "0/10 * * * * ? ")
+ @Transactional
+// @PostConstruct
+ public void finishOrdersExecute(){
+ try {
+ List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 4));
+ if (!Cools.isEmpty(custOrders)) {
+ List<String> numbers = custOrders.stream().map(CustOrder::getNumber).distinct().collect(Collectors.toList());
+ for (String number : numbers) {
+ GetOrderResult0 getOrderResult0 = new GetOrderResult0();
+ List<GetOrderResultDetl0> list = new ArrayList<>();
+ getOrderResult0.setDetail(list);
+ // 閬嶅巻閫掑噺
+ Iterator<CustOrder> iterator = custOrders.iterator();
+ while (iterator.hasNext()) {
+ CustOrder custOrder = iterator.next();
+ if (custOrder.getNumber().equals(number)) {
+ // 琛ㄥご
+ if (Cools.isEmpty(getOrderResult0.getNumber())) {
+ getOrderResult0.setNumber(number);
+ getOrderResult0.setVchType(11); // todo:luxiaotao
+ getOrderResult0.setBillDate(custOrder.getBillDate());
+ getOrderResult0.setBTypeID(custOrder.getBTypeId());
+ getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
+ }
+ // 琛ㄤ綋
+ GetOrderResultDetl0 detl0 = new GetOrderResultDetl0();
+ detl0.setUserCode(custOrder.getUserCode());
+ detl0.setQty(custOrder.getTotal());
+ detl0.setPrice(custOrder.getPrice());
+ detl0.setComment(custOrder.getComment());
+ list.add(detl0);
+ iterator.remove();
+ }
+ }
+
+ System.out.println(JSON.toJSONString(getOrderResult0));
+
+
+ String response = new HttpHandler.Builder()
+ .setUri(URI)
+ .setPath(UPLOAD_BILL)
+ .setJson(JSON.toJSONString(getOrderResult0))
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ log.warn(response);
+ Result result = JSON.parseObject(response, Result.class);
+ if (result.getCode() != 1) {
+ return;
+ }
+ // 杞巻鍙叉。
+ 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());
+ }
+ }
+
+ }
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+
+ }
/**
- * 鏇存柊搴撳瓨
+ * 搴撳瓨涓婁紶
*/
-// @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/15 * * * * ? ")
+ @GetMapping("test2")
public void uploadStockExecute(){
try {
-// locDetlService
-
- Map<String, Object> param = new HashMap<>();
- param.put("rec", 0);
- param.put("Flag", 1);
- String response = new HttpHandler.Builder()
- .setUri(URI)
- .setPath(GET_BASIS)
- .setJson(JSON.toJSONString(param))
- .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());
+ List<LocDetl> statis = locDetlService.getLocDetlStatis();
+ if (!Cools.isEmpty(statis)) {
+ UploadStock uploadStock = new UploadStock();
+ uploadStock.setNumber(String.valueOf(snowflakeIdWorker.nextId()));
+ uploadStock.setVchType(89);
+ uploadStock.setBillDate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
+ uploadStock.setDataSize(statis.size());
+ List<UploadStockDtel> detail = new ArrayList<>();
+ uploadStock.setDetail(detail);
+ for (LocDetl locDetl : statis) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat == null) {continue;}
+ UploadStockDtel detl = new UploadStockDtel();
+ detl.setUserCode(mat.getMatnr());
+ detl.setQty(locDetl.getAnfme());
+// detl.setPrice(Double.parseDouble());
+ detl.setComment(mat.getMemo());
+ detail.add(detl);
}
+ String response = new HttpHandler.Builder()
+ .setUri(URI)
+ .setPath(UPLOAD_STOCK)
+ .setJson(JSON.toJSONString(uploadStock))
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ log.info("涓婃姤搴撳瓨鏄庣粏缁熻 ======>> \nrequest:{} \nresponse:{}", JSON.toJSONString(uploadStock), response);
+ Result result = JSON.parseObject(response, Result.class);
+ if (result.getCode() != 1) {
+ }
+ }
}
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1