From bcaac64c83b58e26b733d1b0fbf049bf02d3a58d Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 07 六月 2022 09:38:18 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 31 +++++++++++++++
src/main/webapp/views/locDetl/locDetl.html | 3 +
src/main/java/com/zy/asrs/task/TestScheduler.java | 18 +++++++++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3 +
src/main/java/com/zy/asrs/service/LocDetlService.java | 3 +
src/main/java/com/zy/asrs/controller/LocDetlController.java | 9 ++++
src/main/resources/mapper/LocDetlMapper.xml | 9 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/task/handler/TestHandler.java | 16 ++++++++
9 files changed, 95 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a83bb8f..553be70 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -90,8 +90,15 @@
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ @RequestParam Map<String, Object> param,
+ @RequestParam(required = false)Boolean unreason){
+ if (unreason) {
+ return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
+ .where(" DATALENGTH( batch ) != 11 or\n" +
+ " batch LIKE '%[a-z]%'")));
+ }
+ param.remove("unreason");
String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
if (param.get("row") != null) {
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 457a7c0..6b2cfa3 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -58,4 +58,7 @@
Integer sum();
+
+ List<LocDetl> unreason();
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index a068386..7473a64 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -48,4 +48,7 @@
Integer sum();
+
+ List<LocDetl> unreason();
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 10243f8..b2141f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -93,6 +93,11 @@
return this.baseMapper.sum();
}
+ @Override
+ public List<LocDetl> unreason() {
+ return this.baseMapper.unreason();
+ }
+
@Override
public LocDetl selectItem(String locNo, String matnr, String batch) {
diff --git a/src/main/java/com/zy/asrs/task/TestScheduler.java b/src/main/java/com/zy/asrs/task/TestScheduler.java
new file mode 100644
index 0000000..0b25929
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/TestScheduler.java
@@ -0,0 +1,18 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.handler.TestHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TestScheduler {
+ @Autowired
+ private TestHandler testHandler;
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void execute(){
+ testHandler.start();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/TestHandler.java b/src/main/java/com/zy/asrs/task/handler/TestHandler.java
new file mode 100644
index 0000000..609d2f2
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/TestHandler.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class TestHandler extends AbstractHandler<String> {
+ public ReturnT<String> start() {
+ System.out.println("瀹屾垚宸ヤ綔妗�" + new Date());
+ return SUCCESS;
+ }
+}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 1202f0b..d658560 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -300,6 +300,15 @@
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
</select>
+ <select id="unreason" resultType="com.zy.asrs.entity.LocDetl">
+ SELECT
+ *
+ FROM
+ [dbo].[asr_loc_detl]
+ WHERE
+ DATALENGTH( batch ) != 11 or
+ batch LIKE '%[a-z]%'
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index fcda34d..7c9a734 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -59,6 +59,9 @@
url: baseUrl+'/locDetl/list/auth',
page: true,
limit: 20,
+ where:{
+ unreason: false
+ },
limits: [20, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
@@ -447,11 +450,35 @@
tableReload(false);
});
+
// 鎼滅储鏍忛噸缃簨浠�
form.on('submit(reset)', function (data) {
pageCurr = 1;
clearFormVal($('#search-box'));
tableReload(false);
+ });
+
+ //鏌ョ湅寮傚父鏁版嵁
+ form.on('submit(unreason)', function (data) {
+ pageCurr = 1;
+
+ tableIns.reload({
+ where: {
+ unreason: true
+ },
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+
+ limit(child);
+ }
+ });
});
// 鏃堕棿閫夋嫨鍣�
@@ -473,7 +500,9 @@
});
function tableReload(child) {
- var searchData = {};
+ var searchData = {
+ unreason: false
+ };
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 1bc97d8..dad6b6c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -38,13 +38,16 @@
<div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
+
</div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>
</div>
+
</div>
<!-- 琛ㄦ牸 -->
--
Gitblit v1.9.1