From 0abb8fc8c901a9aedf70c7c0e5bb86dbd2bd4031 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 11 一月 2023 13:45:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/CheckRecordController.java | 4 +
src/main/java/com/zy/asrs/task/MatScheduler.java | 31 +++++++++++++++
src/main/java/com/zy/asrs/task/handler/MatHandler.java | 35 +++++++++++++++++
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/common/service/CommonService.java | 5 ++
7 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckRecordController.java b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
index 3874c82..d8dbe61 100644
--- a/src/main/java/com/zy/asrs/controller/CheckRecordController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
@@ -42,7 +42,9 @@
excludeTrash(param);
convert(param, wrapper);
allLike(CheckRecord.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
return R.ok(checkRecordService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/task/MatScheduler.java b/src/main/java/com/zy/asrs/task/MatScheduler.java
new file mode 100644
index 0000000..01a2a50
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/MatScheduler.java
@@ -0,0 +1,31 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.MatHandler;
+import com.zy.asrs.task.handler.PlcLogHandler;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Component
+public class MatScheduler {
+
+ @Autowired
+ private MatHandler matHandler;
+
+ @Scheduled(cron = "0 0 1 * * ? ")
+ private void execute(){
+ ReturnT<String> returnT = matHandler.start();
+ if (!returnT.isSuccess()) {
+ log.error(returnT.getMsg());
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/MatHandler.java b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
new file mode 100644
index 0000000..0524e43
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Service
+public class MatHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private JdbcTemplate jdbcTemplate;
+ @Autowired
+ private MatService matService;
+
+ @Transactional
+ public ReturnT<String> start() {
+ try {
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2809921..f343216 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -321,6 +322,10 @@
}
}
}
+// LocMast locMast0 = locMastService.findOutMost(locMasts.stream().map(LocMast::getLocNo).distinct().collect(Collectors.toList()));
+// if (!Cools.isEmpty(locMast0)) {
+// locMast = locMast0;
+// }
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� todo:luxiaotao
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c2873be..e30519c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -125,7 +125,7 @@
select * from
(
select
- ROW_NUMBER() over (order by a.appe_time,a.matnr,a.loc_no) as row,
+ ROW_NUMBER() over (order by a.loc_no,a.appe_time,a.matnr) as row,
a.*
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index e12d484..a101e3e 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -104,7 +104,7 @@
select top 1 * from (
select top 1 * from asr_wrk_mast where 1=1
and crn_no = 2
- and wrk_sts in (11,12,13,14,15,16,17)
+ and wrk_sts in (12,13,14,15,16)
and source_sta_no = #{staNo}
and io_type in (101.103,104,107,110)
union
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 893387e..3f0c85f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -231,7 +231,7 @@
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 200, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
--
Gitblit v1.9.1