From 9e95828ef229e6e5fdec495fe61b54175b927262 Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期三, 01 九月 2021 08:19:45 +0800
Subject: [PATCH] 1.0.7
---
src/main/java/com/zy/ints/mapper/WaitMatoutMapper.java | 3 +
src/main/java/com/zy/ints/service/WaitMatoutLogService.java | 1
src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java | 7 ++
src/main/resources/mapper/WaitMatinMapper.xml | 6 ++
src/main/resources/mapper/WaitMatinLogMapper.xml | 1
src/main/java/com/zy/ints/mapper/WaitMatoutLogMapper.java | 3 +
src/main/java/com/zy/ints/service/impl/WaitMatinServiceImpl.java | 7 ++
src/main/resources/mapper/WaitMatoutMapper.xml | 7 ++
src/main/java/com/zy/ints/service/impl/WaitMatoutServiceImpl.java | 7 ++
src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java | 15 ++--
src/main/java/com/zy/ints/service/impl/WaitMatoutLogServiceImpl.java | 5 +
src/main/java/com/zy/asrs/task/AbstractHandler.java | 2
src/main/java/com/zy/ints/mapper/WaitMatinLogMapper.java | 4 +
src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java | 39 +++++++++++++
src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java | 42 ++++++++++++++
src/main/java/com/zy/ints/service/impl/WaitMatinLogServiceImpl.java | 8 ++
src/main/java/com/zy/ints/service/WaitMatinService.java | 7 ++
src/main/java/com/zy/ints/service/WaitMatinLogService.java | 2
src/main/java/com/zy/ints/mapper/WaitMatinMapper.java | 1
src/main/java/com/zy/ints/service/WaitMatoutService.java | 8 ++
20 files changed, 166 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java
index 9e630fb..64841ec 100644
--- a/src/main/java/com/zy/asrs/task/AbstractHandler.java
+++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -2,8 +2,10 @@
import com.zy.asrs.task.core.AsrsException;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.ints.entity.WaitMatin;
import java.text.MessageFormat;
+import java.util.List;
/**
* Created by vincent on 2020/7/4
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatinLogMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatinLogMapper.java
index 9cad26e..8380270 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatinLogMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatinLogMapper.java
@@ -2,11 +2,15 @@
import com.zy.ints.entity.WaitMatinLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface WaitMatinLogMapper extends BaseMapper<WaitMatinLog> {
+ @Insert("insert into ints_wait_matin_log select * from ints_wait_matin where bill_no=#{billNo} and seq_no=#{seqNo}")
+ int save(@Param("billNo") String billNo,@Param("seqNo") Integer seqNo);
}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatinMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatinMapper.java
index 9343063..16b9dae 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatinMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatinMapper.java
@@ -17,4 +17,5 @@
Integer getHeadPageCount(Map<String, Object> map);
+ List<WaitMatin> selectWaitMatinBySts();
}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatoutLogMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatoutLogMapper.java
index 20d5f68..714734b 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatoutLogMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatoutLogMapper.java
@@ -2,6 +2,7 @@
import com.zy.ints.entity.WaitMatoutLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -9,4 +10,6 @@
@Repository
public interface WaitMatoutLogMapper extends BaseMapper<WaitMatoutLog> {
+ @Insert("insert into ints_wait_matout_log select * from ints_wait_matout where bill_no=#{billNo} and seq_no=#{seqNo}")
+ int save(String billNo, Integer seqNo);
}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatoutMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatoutMapper.java
index 1e80daf..ca07b7e 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatoutMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatoutMapper.java
@@ -1,5 +1,6 @@
package com.zy.ints.mapper;
+import com.zy.ints.entity.WaitMatin;
import com.zy.ints.entity.WaitMatout;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -15,4 +16,6 @@
List<WaitMatout> getHeadPage(Map<String, Object> condition);
Integer getHeadPageCount(Map<String, Object> condition);
+
+ List<WaitMatout> selectWaitMatOutBySts();
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatinLogService.java b/src/main/java/com/zy/ints/service/WaitMatinLogService.java
index c9468fd..2dbfe2e 100644
--- a/src/main/java/com/zy/ints/service/WaitMatinLogService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatinLogService.java
@@ -5,4 +5,6 @@
public interface WaitMatinLogService extends IService<WaitMatinLog> {
+
+ boolean save(String billNo, Integer seqNo);
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatinService.java b/src/main/java/com/zy/ints/service/WaitMatinService.java
index f414a97..79adc48 100644
--- a/src/main/java/com/zy/ints/service/WaitMatinService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatinService.java
@@ -5,8 +5,15 @@
import com.zy.ints.entity.WaitMatin;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface WaitMatinService extends IService<WaitMatin> {
Page<WaitMatin> getHeadPage(Page<WaitMatin> page);
+ /**
+ * 鏌ヨ宸插畬鎴愬叆搴撶殑鍏ュ簱閫氱煡妗�
+ * @return
+ */
+ List<WaitMatin> selectWaitMatinBySts();
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatoutLogService.java b/src/main/java/com/zy/ints/service/WaitMatoutLogService.java
index 49d891d..386e079 100644
--- a/src/main/java/com/zy/ints/service/WaitMatoutLogService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatoutLogService.java
@@ -5,4 +5,5 @@
public interface WaitMatoutLogService extends IService<WaitMatoutLog> {
+ Boolean save(String billNo, Integer seqNo);
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatoutService.java b/src/main/java/com/zy/ints/service/WaitMatoutService.java
index 27ace8b..6339231 100644
--- a/src/main/java/com/zy/ints/service/WaitMatoutService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatoutService.java
@@ -5,7 +5,15 @@
import com.zy.ints.entity.WaitMatout;
import com.baomidou.mybatisplus.service.IService;
+import java.util.List;
+
public interface WaitMatoutService extends IService<WaitMatout> {
Page<WaitMatout> getHeadPage(Page<WaitMatout> toPage);
+
+ /**
+ * 鏌ヨ鐘舵�佷负鍑哄簱瀹屾垚鐨勬墍鏈夊嚭搴撻�氱煡妗�
+ * @return
+ */
+ List<WaitMatout> selectWaitMatOutBySts();
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatinLogServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatinLogServiceImpl.java
index 92b7976..31260be 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatinLogServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatinLogServiceImpl.java
@@ -1,12 +1,20 @@
package com.zy.ints.service.impl;
+import com.zy.ints.mapper.WaitMatchkMapper;
import com.zy.ints.mapper.WaitMatinLogMapper;
import com.zy.ints.entity.WaitMatinLog;
import com.zy.ints.service.WaitMatinLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service("waitMatinLogService")
public class WaitMatinLogServiceImpl extends ServiceImpl<WaitMatinLogMapper, WaitMatinLog> implements WaitMatinLogService {
+
+ @Override
+ public boolean save(String billNo, Integer seqNo) {
+
+ return this.baseMapper.save(billNo,seqNo)>0;
+ }
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatinServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatinServiceImpl.java
index d6d9a41..0358b41 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatinServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatinServiceImpl.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("waitMatinService")
public class WaitMatinServiceImpl extends ServiceImpl<WaitMatinMapper, WaitMatin> implements WaitMatinService {
@@ -17,4 +19,9 @@
return page;
}
+ @Override
+ public List<WaitMatin> selectWaitMatinBySts() {
+ return baseMapper.selectWaitMatinBySts();
+ }
+
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatoutLogServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatoutLogServiceImpl.java
index da79cdb..b56a09d 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatoutLogServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatoutLogServiceImpl.java
@@ -9,4 +9,9 @@
@Service("waitMatoutLogService")
public class WaitMatoutLogServiceImpl extends ServiceImpl<WaitMatoutLogMapper, WaitMatoutLog> implements WaitMatoutLogService {
+ @Override
+ public Boolean save(String billNo, Integer seqNo) {
+
+ return this.baseMapper.save(billNo,seqNo)>0;
+ }
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatoutServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatoutServiceImpl.java
index 46044ad..68c1029 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatoutServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatoutServiceImpl.java
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("waitMatoutService")
public class WaitMatoutServiceImpl extends ServiceImpl<WaitMatoutMapper, WaitMatout> implements WaitMatoutService {
@@ -18,4 +20,9 @@
page.setTotal(baseMapper.getHeadPageCount(page.getCondition()));
return page;
}
+
+ @Override
+ public List<WaitMatout> selectWaitMatOutBySts() {
+ return this.baseMapper.selectWaitMatOutBySts();
+ }
}
diff --git a/src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java
new file mode 100644
index 0000000..d0f4bc3
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java
@@ -0,0 +1,39 @@
+package com.zy.ints.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.entity.WaitMatoutLog;
+import com.zy.ints.service.WaitMatoutLogService;
+import com.zy.ints.service.WaitMatoutService;
+import com.zy.ints.task.handler.WaitMatOutLogHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class WaitMatOutLogScheduler {
+ private static final Logger log = LoggerFactory.getLogger(WaitMatOutLogScheduler.class);
+
+ @Autowired
+ private WaitMatoutService waitMatoutService;
+
+ @Autowired
+ private WaitMatOutLogHandler waitMatOutLogHandler;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ List<WaitMatout> waitMatouts = waitMatoutService.selectWaitMatOutBySts();
+ for (WaitMatout waitMatout : waitMatouts) {
+ ReturnT<String> result = waitMatOutLogHandler.start(waitMatout);
+ if (!result.isSuccess()) {
+ log.error("鍏ュ簱閫氱煡妗billNo={}],[seqNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", waitMatout.getBillNo(),waitMatout.getSeqNo());
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
index 2a629bc..9db953f 100644
--- a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
+++ b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
@@ -2,6 +2,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.service.WaitMatinService;
import com.zy.ints.task.handler.WaitMatinLogHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,14 +18,18 @@
*/
@Component
public class WaitMatinLogScheduler {
+
private static final Logger log = LoggerFactory.getLogger(WaitMatinLogScheduler.class);
@Autowired
private WaitMatinLogHandler waitMatinLogHandler;
+ @Autowired
+ private WaitMatinService waitMatinService;
+
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
- List<WaitMatin> WaitMatins = null;
+ List<WaitMatin> WaitMatins = waitMatinService.selectWaitMatinBySts();
for (WaitMatin waitMatin : WaitMatins) {
ReturnT<String> result = waitMatinLogHandler.start(waitMatin);
if (!result.isSuccess()) {
diff --git a/src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java b/src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java
new file mode 100644
index 0000000..73d9cf0
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java
@@ -0,0 +1,42 @@
+package com.zy.ints.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+
+import com.zy.ints.entity.WaitMatin;
+import com.zy.ints.entity.WaitMatout;
+import com.zy.ints.service.WaitMatoutLogService;
+import com.zy.ints.service.WaitMatoutService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+@Service
+public class WaitMatOutLogHandler extends AbstractHandler<String> {
+ @Autowired
+ private WaitMatoutLogService waitMatoutLogService;
+
+ @Autowired
+ private WaitMatoutService waitMatoutService;
+
+ public ReturnT<String> start(WaitMatout waitMatout) {
+
+ try {
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!waitMatoutLogService.save(waitMatout.getBillNo(),waitMatout.getSeqNo())) {
+ exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", waitMatout.getBillNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!waitMatoutService.delete(new EntityWrapper<WaitMatout>().eq("bill_no", waitMatout.getBillNo()).eq("seq_no", waitMatout.getSeqNo()))) {
+ exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", waitMatout.getBillNo());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+}
diff --git a/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java b/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java
index 3f3730b..b2dcaaa 100644
--- a/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java
+++ b/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java
@@ -1,5 +1,6 @@
package com.zy.ints.task.handler;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.ints.entity.WaitMatin;
@@ -26,13 +27,13 @@
public ReturnT<String> start(WaitMatin waitMatin){
try {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
-// if (!WaitMatinLogService.save(waitMatin.getBillNo(),waitMatin.getSeqNo())) {
-// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
-// // 鍒犻櫎宸ヤ綔涓绘。
-// if (!wrkMastService.deleteById(wrkMast)) {
-// exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
-// }
+ if (!waitMatinLogService.save(waitMatin.getBillNo(),waitMatin.getSeqNo())) {
+ exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", waitMatin.getBillNo());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatin.getBillNo()).eq("seq_no", waitMatin.getSeqNo()))) {
+ exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", waitMatin.getBillNo());
+ }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/resources/mapper/WaitMatinLogMapper.xml b/src/main/resources/mapper/WaitMatinLogMapper.xml
index 2760dc9..89a57ee 100644
--- a/src/main/resources/mapper/WaitMatinLogMapper.xml
+++ b/src/main/resources/mapper/WaitMatinLogMapper.xml
@@ -27,4 +27,5 @@
</resultMap>
+
</mapper>
diff --git a/src/main/resources/mapper/WaitMatinMapper.xml b/src/main/resources/mapper/WaitMatinMapper.xml
index 622c43b..8097c6a 100644
--- a/src/main/resources/mapper/WaitMatinMapper.xml
+++ b/src/main/resources/mapper/WaitMatinMapper.xml
@@ -75,5 +75,11 @@
) r
) t
</select>
+ <select id="selectWaitMatinBySts" resultMap="BaseResultMap">
+ select * from ints_wait_matin
+ where io_status=2
+ or (in_qty=qty)
+ order by modi_time,mat_no asc
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/WaitMatoutMapper.xml b/src/main/resources/mapper/WaitMatoutMapper.xml
index 88472f8..f225bcd 100644
--- a/src/main/resources/mapper/WaitMatoutMapper.xml
+++ b/src/main/resources/mapper/WaitMatoutMapper.xml
@@ -63,7 +63,6 @@
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
<select id="getHeadPageCount" parameterType="java.util.Map" resultType="integer">
-
select count(1) from
(
select *,
@@ -76,5 +75,11 @@
) r
) t
</select>
+ <select id="selectWaitMatOutBySts" resultMap="BaseResultMap">
+ select * from ints_wait_matout
+ where io_status=2
+ or (out_qty=qty)
+ order by modi_time,mat_no asc
+ </select>
</mapper>
--
Gitblit v1.9.1