From b31c69631ee75cdc02195a2e3efff3f9ad95943d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 三月 2021 16:08:45 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java | 5 +
src/main/java/zy/cloud/wms/common/service/task/LogScheduler.java | 23 +++++++
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 86 +++++++++++++++++++++++++++-
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java | 7 +
4 files changed, 115 insertions(+), 6 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 7139fd2..b494ced 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
@@ -19,16 +19,14 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Tag;
+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;
/**
@@ -57,6 +55,8 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private CustOrderMapper custOrderMapper;
/**
* 鍟嗗搧涓嬭浇
@@ -202,6 +202,7 @@
}
} catch (Exception e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
}
@@ -264,6 +265,7 @@
}
} catch (Exception e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
}
@@ -335,10 +337,85 @@
}
} 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(34); // todo:luxiaotao
+ getOrderResult0.setBillDate(custOrder.getBillDate());
+ getOrderResult0.setBTypeID(custOrder.getBTypeId());
+ getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
+ }
+ // 琛ㄤ綋
+ GetOrderResultDetl0 detl0 = new GetOrderResultDetl0();
+ detl0.setUserCode(custOrder.getUserCode());
+ detl0.setQty(custOrder.getQty());
+ detl0.setPrice(custOrder.getPrice());
+ detl0.setComment(custOrder.getComment());
+ list.add(detl0);
+ iterator.remove();
+ }
+ }
+
+ System.out.println(JSON.toJSONString(getOrderResult0));
+
+ int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
+ if (save > 0) {
+ if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
+ throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
+ }
+ }
+
+// String response = new HttpHandler.Builder()
+// .setUri(URI)
+// .setPath(GET_ORDERS)
+// .setJson(JSON.toJSONString(getOrderResult0))
+// .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;
+// }
+// // 杞巻鍙叉。
+// }
+
+ }
+ }
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
+ }
+
+ }
/**
* 鏇存柊搴撳瓨
@@ -413,6 +490,7 @@
}
} catch (Exception e) {
e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java
index 7cd609c..d93540c 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResult0.java
@@ -16,6 +16,8 @@
// 鑷
private String Vchcode;
+ private Integer vchType;
+
// 澶囨敞
private String summary;
@@ -28,6 +30,9 @@
// 缁忔墜浜虹紪鍙� 鍙┖
private String eTypeID;
+ // 浠撳簱缂栧彿
+ private String kTypeID;
+
private List<GetOrderResultDetl0> Detail;
diff --git a/src/main/java/zy/cloud/wms/common/service/task/LogScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/LogScheduler.java
new file mode 100644
index 0000000..f6b1b46
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/service/task/LogScheduler.java
@@ -0,0 +1,23 @@
+package zy.cloud.wms.common.service.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鍘嗗彶妗ｄ换鍔℃帶鍒跺櫒
+ * Created by vincent on 2020/11/27
+ */
+@Slf4j
+@Component
+@RestController
+public class LogScheduler {
+
+ @Transactional
+// @PostConstruct
+ public void custOrderLogExecute(){
+
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
index ae3ac37..3c1be77 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
@@ -1,9 +1,8 @@
package zy.cloud.wms.manager.mapper;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.*;
import zy.cloud.wms.manager.entity.CustOrder;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@@ -12,5 +11,9 @@
int updateStatus(@Param("number") String number, @Param("status") Integer status);
+ @Insert("insert into man_cust_order_log select * from man_cust_order where number=#{number}")
+ int saveLog(String number);
+ @Update("delete from man_cust_order where number=#{number}")
+ int delete(@Param("number") String number);
}
--
Gitblit v1.9.1