From 6fd276e85c43c6445840caa6e2891b7d3230490a Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 02 九月 2021 15:48:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/ints/service/WaitMatchkLogService.java | 2
src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java | 2
src/main/java/com/zy/ints/service/impl/IoCompleteLogServiceImpl.java | 4
src/main/resources/mapper/WaitMatchkMapper.xml | 6 +
src/main/java/com/zy/ints/task/WaitMatoutLogScheduler.java | 19 ++--
src/main/java/com/zy/ints/mapper/WaitMatchkLogMapper.java | 5 +
src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java | 7 +
src/main/java/com/zy/ints/service/WaitMatchkService.java | 6 +
src/main/java/com/zy/ints/task/IoCompleteLogScheduler.java | 24 -----
src/main/java/com/zy/ints/task/handler/IoCompleteLogHandler.java | 11 +-
src/main/java/com/zy/ints/task/handler/WaitMatchkLogHandler.java | 39 +++++++++
src/main/java/com/zy/ints/task/handler/WaitMatoutLogHandler.java | 13 +--
src/main/java/com/zy/ints/service/IoCompleteLogService.java | 2
src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java | 8 +-
src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java | 6 +
src/main/java/com/zy/ints/mapper/IoCompleteLogMapper.java | 9 +
src/main/java/com/zy/ints/service/impl/WaitMatchkLogServiceImpl.java | 5 +
src/main/java/com/zy/ints/task/WaitMatchkLogScheduler.java | 38 +++++++++
18 files changed, 144 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/zy/ints/mapper/IoCompleteLogMapper.java b/src/main/java/com/zy/ints/mapper/IoCompleteLogMapper.java
index 17f4482..bfe8128 100644
--- a/src/main/java/com/zy/ints/mapper/IoCompleteLogMapper.java
+++ b/src/main/java/com/zy/ints/mapper/IoCompleteLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.ints.mapper;
-import com.zy.ints.entity.IoCompleteLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.ints.entity.IoCompleteLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -11,7 +11,10 @@
@Repository
public interface IoCompleteLogMapper extends BaseMapper<IoCompleteLog> {
- @Insert("insert into ints_io_complete_log select * from ints_io_complete where bill_no=#{billNo} and seq_no=#{seqNo}")
- int save(@Param("billNo") String billNo,@Param("seqNo") Integer seqNo);
+// @Insert("insert into ints_io_complete_log select * from ints_io_complete where bill_no=#{billNo} and seq_no=#{seqNo}")
+// int save(@Param("billNo") String billNo,@Param("seqNo") Integer seqNo);
+
+ @Insert("insert into ints_io_complete_log select * from ints_io_complete where id=#{id}")
+ int save(@Param("id") Long id);
}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatchkLogMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatchkLogMapper.java
index ef13ba3..245d48c 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatchkLogMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatchkLogMapper.java
@@ -2,11 +2,14 @@
import com.zy.ints.entity.WaitMatchkLog;
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 WaitMatchkLogMapper extends BaseMapper<WaitMatchkLog> {
-
+ @Insert("insert into ints_wait_matchk_log select * from ints_wait_matchk where bill_no=#{billNo} and locNo=#{locNo} and matNo=#{matNo}")
+ int save(@Param("billNo") String billNo, @Param("locNo") String locNo, @Param("matNo") String matNo);
}
diff --git a/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java b/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java
index 61ef707..552b0ff 100644
--- a/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java
+++ b/src/main/java/com/zy/ints/mapper/WaitMatchkMapper.java
@@ -1,12 +1,14 @@
package com.zy.ints.mapper;
-import com.zy.ints.entity.WaitMatchk;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.ints.entity.WaitMatchk;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
public interface WaitMatchkMapper extends BaseMapper<WaitMatchk> {
-
+ List<WaitMatchk> selectWaitMatchkBySts();
}
diff --git a/src/main/java/com/zy/ints/service/IoCompleteLogService.java b/src/main/java/com/zy/ints/service/IoCompleteLogService.java
index 4d1642e..8b8126b 100644
--- a/src/main/java/com/zy/ints/service/IoCompleteLogService.java
+++ b/src/main/java/com/zy/ints/service/IoCompleteLogService.java
@@ -5,5 +5,5 @@
public interface IoCompleteLogService extends IService<IoCompleteLog> {
- Boolean save(String billNo, Integer seqNo);
+ Boolean save(Long id);
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatchkLogService.java b/src/main/java/com/zy/ints/service/WaitMatchkLogService.java
index 9fb3c1f..9e91eba 100644
--- a/src/main/java/com/zy/ints/service/WaitMatchkLogService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatchkLogService.java
@@ -4,5 +4,5 @@
import com.baomidou.mybatisplus.service.IService;
public interface WaitMatchkLogService extends IService<WaitMatchkLog> {
-
+ boolean save(String billNo, String locNo, String matNo);
}
diff --git a/src/main/java/com/zy/ints/service/WaitMatchkService.java b/src/main/java/com/zy/ints/service/WaitMatchkService.java
index 96fa040..0f247e8 100644
--- a/src/main/java/com/zy/ints/service/WaitMatchkService.java
+++ b/src/main/java/com/zy/ints/service/WaitMatchkService.java
@@ -1,8 +1,12 @@
package com.zy.ints.service;
-import com.zy.ints.entity.WaitMatchk;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.ints.entity.WaitMatchk;
+
+import java.util.List;
public interface WaitMatchkService extends IService<WaitMatchk> {
+ List<WaitMatchk> selectWaitMatchkBySts();
+
}
diff --git a/src/main/java/com/zy/ints/service/impl/IoCompleteLogServiceImpl.java b/src/main/java/com/zy/ints/service/impl/IoCompleteLogServiceImpl.java
index ea2b996..5d7dd77 100644
--- a/src/main/java/com/zy/ints/service/impl/IoCompleteLogServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/IoCompleteLogServiceImpl.java
@@ -10,8 +10,8 @@
public class IoCompleteLogServiceImpl extends ServiceImpl<IoCompleteLogMapper, IoCompleteLog> implements IoCompleteLogService {
@Override
- public Boolean save(String billNo, Integer seqNo) {
+ public Boolean save(Long id) {
- return this.baseMapper.save(billNo,seqNo)>0;
+ return this.baseMapper.save(id)>0;
}
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatchkLogServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatchkLogServiceImpl.java
index 2606719..005b198 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatchkLogServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatchkLogServiceImpl.java
@@ -9,4 +9,9 @@
@Service("waitMatchkLogService")
public class WaitMatchkLogServiceImpl extends ServiceImpl<WaitMatchkLogMapper, WaitMatchkLog> implements WaitMatchkLogService {
+ @Override
+ public boolean save(String billNo, String locNo, String matNo) {
+
+ return this.baseMapper.save(billNo,locNo,matNo)>0;
+ }
}
diff --git a/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java b/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java
index d34c3d2..014f46e 100644
--- a/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java
+++ b/src/main/java/com/zy/ints/service/impl/WaitMatchkServiceImpl.java
@@ -6,7 +6,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service("waitMatchkService")
public class WaitMatchkServiceImpl extends ServiceImpl<WaitMatchkMapper, WaitMatchk> implements WaitMatchkService {
+ @Override
+ public List<WaitMatchk> selectWaitMatchkBySts() {
+ return baseMapper.selectWaitMatchkBySts();
+ }
+
}
diff --git a/src/main/java/com/zy/ints/task/IoCompleteLogScheduler.java b/src/main/java/com/zy/ints/task/IoCompleteLogScheduler.java
index ad31a13..065a85f 100644
--- a/src/main/java/com/zy/ints/task/IoCompleteLogScheduler.java
+++ b/src/main/java/com/zy/ints/task/IoCompleteLogScheduler.java
@@ -1,39 +1,19 @@
package com.zy.ints.task;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.web.BaseController;
import com.zy.ints.entity.IoComplete;
-import com.zy.ints.entity.IoCompleteLog;
-import com.zy.ints.entity.WaitMatin;
-import com.zy.ints.service.IoCompleteLogService;
import com.zy.ints.service.IoCompleteService;
-import com.zy.ints.service.WaitMatinService;
import com.zy.ints.task.handler.IoCompleteLogHandler;
-import com.zy.ints.task.handler.WaitMatinLogHandler;
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 org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
- * 鍥炴姤妗ｇ鐞嗚浆鍥炴姤鍘嗗彶妗�
+ * 鍥炴姤妗ｈ浆鍘嗗彶妗�
* Created by TQS on 2021/8/31
*/
@Component
@@ -54,7 +34,7 @@
for (IoComplete ioComplete : ioCompletes) {
ReturnT<String> result = ioCompleteLogHandler.start(ioComplete);
if (!result.isSuccess()) {
- log.error("鍥炴姤妗billNo={}],[seqNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", ioComplete.getBillNo(),ioComplete.getSeqNo());
+ log.error("鍥炴姤妗id={}]鍘嗗彶妗ｅ鐞嗗け璐�", ioComplete.getId());
}
}
}
diff --git a/src/main/java/com/zy/ints/task/WaitMatchkLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatchkLogScheduler.java
new file mode 100644
index 0000000..465754a
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/WaitMatchkLogScheduler.java
@@ -0,0 +1,38 @@
+package com.zy.ints.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.ints.entity.WaitMatchk;
+import com.zy.ints.service.WaitMatchkService;
+import com.zy.ints.task.handler.WaitMatchkLogHandler;
+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;
+
+/**
+ * 鐩樼偣閫氱煡妗ｈ浆鍘嗗彶妗�
+ * Created by TQS on 2021/9/2
+ */
+@Component
+public class WaitMatchkLogScheduler {
+ private static final Logger log = LoggerFactory.getLogger(WaitMatchkLogScheduler.class);
+
+ @Autowired
+ private WaitMatchkLogHandler waitMatchkLogHandler;
+ @Autowired
+ private WaitMatchkService waitMatchkService;
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ private void execute(){
+ List<WaitMatchk> waitMatchks = null;
+ for (WaitMatchk waitMatchk : waitMatchks) {
+ ReturnT<String> result = waitMatchkLogHandler.start(waitMatchk);
+ if (!result.isSuccess()) {
+ log.error("鐩樼偣閫氱煡妗billNo={},locNo={},matNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", waitMatchk.getBillNo(),waitMatchk.getLocNo(),waitMatchk.getMatNo());
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
index b1457d6..d7ab18c 100644
--- a/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
+++ b/src/main/java/com/zy/ints/task/WaitMatinLogScheduler.java
@@ -28,7 +28,7 @@
private WaitMatinService waitMatinService;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/4 * * * * ? ")
private void execute(){
List<WaitMatin> WaitMatins = waitMatinService.selectWaitMatinBySts();
for (WaitMatin waitMatin : WaitMatins) {
diff --git a/src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java b/src/main/java/com/zy/ints/task/WaitMatoutLogScheduler.java
similarity index 64%
rename from src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java
rename to src/main/java/com/zy/ints/task/WaitMatoutLogScheduler.java
index 7afc313..89ccbbb 100644
--- a/src/main/java/com/zy/ints/task/WaitMatOutLogScheduler.java
+++ b/src/main/java/com/zy/ints/task/WaitMatoutLogScheduler.java
@@ -1,12 +1,9 @@
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 com.zy.ints.task.handler.WaitMatoutLogHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,23 +12,27 @@
import java.util.List;
+/**
+ * 鍑哄簱閫氱煡妗ｈ浆鍘嗗彶妗�
+ * Created by TQS on 2021/8/31
+ */
@Component
-public class WaitMatOutLogScheduler {
- private static final Logger log = LoggerFactory.getLogger(WaitMatOutLogScheduler.class);
+public class WaitMatoutLogScheduler {
+ private static final Logger log = LoggerFactory.getLogger(WaitMatoutLogScheduler.class);
@Autowired
private WaitMatoutService waitMatoutService;
@Autowired
- private WaitMatOutLogHandler waitMatOutLogHandler;
+ private WaitMatoutLogHandler waitMatOutLogHandler;
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/4 * * * * ? ")
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());
+ log.error("鍑哄簱閫氱煡妗billNo={},seqNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", waitMatout.getBillNo(),waitMatout.getSeqNo());
}
}
}
diff --git a/src/main/java/com/zy/ints/task/handler/IoCompleteLogHandler.java b/src/main/java/com/zy/ints/task/handler/IoCompleteLogHandler.java
index 213489f..95403ad 100644
--- a/src/main/java/com/zy/ints/task/handler/IoCompleteLogHandler.java
+++ b/src/main/java/com/zy/ints/task/handler/IoCompleteLogHandler.java
@@ -4,14 +4,11 @@
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.ints.entity.IoComplete;
-import com.zy.ints.entity.WaitMatin;
import com.zy.ints.service.IoCompleteLogService;
import com.zy.ints.service.IoCompleteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-import javax.xml.ws.ServiceMode;
@Service
public class IoCompleteLogHandler extends AbstractHandler<String> {
@@ -25,12 +22,12 @@
public ReturnT<String> start(IoComplete ioComplete) {
try {
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!ioCompleteLogService.save(ioComplete.getBillNo(),ioComplete.getSeqNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", ioComplete.getBillNo());
+ if (!ioCompleteLogService.save(ioComplete.getId())) {
+ exceptionHandle("淇濆瓨鍥炴姤鍘嗗彶妗id={0}]澶辫触", ioComplete.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
- if (!ioCompleteService.delete(new EntityWrapper<IoComplete>().eq("bill_no", ioComplete.getBillNo()).eq("seq_no", ioComplete.getSeqNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", ioComplete.getBillNo());
+ if (!ioCompleteService.delete(new EntityWrapper<IoComplete>().eq("id", ioComplete.getId()))) {
+ exceptionHandle("鍒犻櫎鍥炴姤妗id={0}]澶辫触", ioComplete.getId());
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/ints/task/handler/WaitMatchkLogHandler.java b/src/main/java/com/zy/ints/task/handler/WaitMatchkLogHandler.java
new file mode 100644
index 0000000..6d69469
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/handler/WaitMatchkLogHandler.java
@@ -0,0 +1,39 @@
+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.WaitMatchk;
+import com.zy.ints.service.WaitMatchkLogService;
+import com.zy.ints.service.WaitMatchkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+@Service
+public class WaitMatchkLogHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private WaitMatchkService waitMatchkService;
+ @Autowired
+ private WaitMatchkLogService waitMatchkLogService;
+
+ public ReturnT<String> start(WaitMatchk waitMatchk){
+ try {
+ // 淇濆瓨鐩樼偣閫氱煡鍘嗗彶妗�
+ if (!waitMatchkLogService.save(waitMatchk.getBillNo(),waitMatchk.getLocNo(),waitMatchk.getMatNo())) {
+ exceptionHandle("淇濆瓨鐩樼偣閫氱煡鍘嗗彶妗billNo={0},locNo={1},matNo={2}]澶辫触", waitMatchk.getBillNo(),waitMatchk.getLocNo(),waitMatchk.getMatNo());
+ }
+ // 鍒犻櫎鐩樼偣閫氱煡妗�
+ if (!waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no", waitMatchk.getBillNo()).eq("loc_no", waitMatchk.getSeqNo())
+ .eq("mat_no", waitMatchk.getMatNo()))) {
+ exceptionHandle("鍒犻櫎鐩樼偣閫氱煡妗billNo={0},locNo={1},matNo={2}]澶辫触", waitMatchk.getBillNo(),waitMatchk.getLocNo(),waitMatchk.getMatNo());
+ }
+ } 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 b2dcaaa..abe3aaa 100644
--- a/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java
+++ b/src/main/java/com/zy/ints/task/handler/WaitMatinLogHandler.java
@@ -26,13 +26,13 @@
@Transactional
public ReturnT<String> start(WaitMatin waitMatin){
try {
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ // 淇濆瓨鍏ュ簱閫氱煡鍘嗗彶妗�
if (!waitMatinLogService.save(waitMatin.getBillNo(),waitMatin.getSeqNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", waitMatin.getBillNo());
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡鍘嗗彶妗billNo={0},seqNo={1}]澶辫触", waitMatin.getBillNo(),waitMatin.getSeqNo());
}
- // 鍒犻櫎宸ヤ綔涓绘。
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
if (!waitMatinService.delete(new EntityWrapper<WaitMatin>().eq("bill_no", waitMatin.getBillNo()).eq("seq_no", waitMatin.getSeqNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", waitMatin.getBillNo());
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗billNo={0},seqNo={1}]澶辫触", waitMatin.getBillNo(),waitMatin.getSeqNo());
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java b/src/main/java/com/zy/ints/task/handler/WaitMatoutLogHandler.java
similarity index 73%
rename from src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java
rename to src/main/java/com/zy/ints/task/handler/WaitMatoutLogHandler.java
index 3c33713..9153800 100644
--- a/src/main/java/com/zy/ints/task/handler/WaitMatOutLogHandler.java
+++ b/src/main/java/com/zy/ints/task/handler/WaitMatoutLogHandler.java
@@ -3,18 +3,15 @@
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> {
+public class WaitMatoutLogHandler extends AbstractHandler<String> {
@Autowired
private WaitMatoutLogService waitMatoutLogService;
@@ -25,13 +22,13 @@
public ReturnT<String> start(WaitMatout waitMatout) {
try {
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ // 淇濆瓨鍑哄簱閫氱煡鍘嗗彶妗�
if (!waitMatoutLogService.save(waitMatout.getBillNo(),waitMatout.getSeqNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", waitMatout.getBillNo());
+ exceptionHandle("淇濆瓨鍑哄簱閫氱煡鍘嗗彶妗billNo={0},seqNo={1}]澶辫触", waitMatout.getBillNo());
}
- // 鍒犻櫎宸ヤ綔涓绘。
+ // 鍒犻櫎鍑哄簱閫氱煡妗�
if (!waitMatoutService.delete(new EntityWrapper<WaitMatout>().eq("bill_no", waitMatout.getBillNo()).eq("seq_no", waitMatout.getSeqNo()))) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", waitMatout.getBillNo());
+ exceptionHandle("鍒犻櫎鍑哄簱閫氱煡妗billNo={0},seqNo={1}]澶辫触", waitMatout.getBillNo());
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/resources/mapper/WaitMatchkMapper.xml b/src/main/resources/mapper/WaitMatchkMapper.xml
index 241c3e0..39c0ece 100644
--- a/src/main/resources/mapper/WaitMatchkMapper.xml
+++ b/src/main/resources/mapper/WaitMatchkMapper.xml
@@ -25,4 +25,10 @@
</resultMap>
+ <select id="selectWaitMatchkBySts" resultMap="BaseResultMap">
+ select * from ints_wait_matchk
+ where io_status=2
+ order by modi_time,mat_no asc
+ </select>
+
</mapper>
--
Gitblit v1.9.1