From 7bdaf206fa5014720f92b86dd339f579b33cc7d5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 01 三月 2021 14:45:35 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/common/service/MainScheduler.java | 38 +++++++++++++++++++
src/main/java/zy/cloud/wms/manager/entity/CustOrder.java | 4 +
src/main/resources/mapper/CustOrderMapper.xml | 4 ++
src/main/java/zy/cloud/wms/manager/service/CustOrderService.java | 2 +
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 44 ++++++++++++++++++----
src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java | 4 ++
src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java | 3 +
src/main/java/zy/cloud/wms/common/service/MainService.java | 6 +-
8 files changed, 93 insertions(+), 12 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/MainScheduler.java b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
new file mode 100644
index 0000000..797632d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/service/MainScheduler.java
@@ -0,0 +1,38 @@
+package zy.cloud.wms.common.service;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import zy.cloud.wms.manager.entity.CustOrder;
+import zy.cloud.wms.manager.service.CustOrderService;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2021/3/1
+ */
+@Slf4j
+@Component
+public class MainScheduler {
+
+ @Autowired
+ private CustOrderService custOrderService;
+ @Autowired
+ private MainService mainService;
+
+ /**
+ * 鎵弿閿�鍞鍗曟暟鎹紝鐢熸垚鍑哄簱鍗�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ public void stockOutExecute(){
+ List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("status", 1));
+ if (Cools.isEmpty(custOrders)){
+ return;
+ }
+
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/common/service/MainService.java b/src/main/java/zy/cloud/wms/common/service/MainService.java
index 3cfd663..8fb5db3 100644
--- a/src/main/java/zy/cloud/wms/common/service/MainService.java
+++ b/src/main/java/zy/cloud/wms/common/service/MainService.java
@@ -6,7 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import zy.cloud.wms.common.service.erp.entity.GetDataResult;
+import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.Prior;
@@ -33,11 +33,11 @@
private PriorService priorService;
@Transactional
- public void stockOutProcess(List<GetDataResult> list) {
+ public void stockOutProcess(List<CustOrder> list) {
if (Cools.isEmpty(list)) {
return;
}
- for (GetDataResult data : list) {
+ for (CustOrder data : list) {
// 鍒ゆ柇鐗╂枡鏄惁瀛樺湪
Mat mat = matService.selectByMatnr(data.getUserCode());
if (null == mat) {
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..ff32f86 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,12 +5,14 @@
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;
@@ -27,14 +29,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 +50,36 @@
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("淇濆瓨閿�鍞鍗曞け璐ワ紒");
+ }
+ }
+// custOrderService.completeLoading(list)
}
}
} catch (IOException e) {
@@ -62,4 +88,6 @@
}
+
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
index af7f0e1..27b6c23 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/CustOrder.java
@@ -69,7 +69,7 @@
/**
* 鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父
*/
- @ApiModelProperty(value= "鐘舵�� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 杞藉叆涓� 1: 寰呭鐞� 2: 宸插畬鎴� 3: 鍙栨秷 4: 寮傚父 ")
private Integer status;
/**
@@ -195,6 +195,8 @@
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
+ case 0:
+ return "杞藉叆涓�";
case 1:
return "寰呭鐞�";
case 2:
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 0a92709..91dad4e 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/CustOrderMapper.java
@@ -9,4 +9,7 @@
@Repository
public interface CustOrderMapper extends BaseMapper<CustOrder> {
+
+ int completeLoading(String number);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
index 29e2114..f36758a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/CustOrderService.java
@@ -5,4 +5,6 @@
public interface CustOrderService extends IService<CustOrder> {
+ boolean completeLoading(String number);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
index c4e8638..45a535a 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/CustOrderServiceImpl.java
@@ -9,4 +9,8 @@
@Service("custOrderService")
public class CustOrderServiceImpl extends ServiceImpl<CustOrderMapper, CustOrder> implements CustOrderService {
+ @Override
+ public boolean completeLoading(String number) {
+ return this.baseMapper.completeLoading(number) > 0;
+ }
}
diff --git a/src/main/resources/mapper/CustOrderMapper.xml b/src/main/resources/mapper/CustOrderMapper.xml
index a718449..456da39 100644
--- a/src/main/resources/mapper/CustOrderMapper.xml
+++ b/src/main/resources/mapper/CustOrderMapper.xml
@@ -19,4 +19,8 @@
</resultMap>
+ <update id="completeLoading">
+ update man_cust_order set status = 1 where 1=1 and number = #{number}
+ </update>
+
</mapper>
--
Gitblit v1.9.1