From 42a8e116659a791594605fb9dc075f3206975e24 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期三, 11 一月 2023 14:42:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/MatScheduler.java       |    1 +
 src/main/java/com/zy/asrs/task/handler/MatHandler.java |   22 +++++++++++++---------
 src/main/resources/mapper/LocMastMapper.xml            |    4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/MatScheduler.java b/src/main/java/com/zy/asrs/task/MatScheduler.java
index 88c936f..13d496c 100644
--- a/src/main/java/com/zy/asrs/task/MatScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MatScheduler.java
@@ -20,6 +20,7 @@
     @Autowired
     private MatHandler matHandler;
 
+//    @Scheduled(cron = "0/3 * * * * ? ")
     @Scheduled(cron = "0 0 23 * * ? ")
     private void execute(){
         ReturnT<String> returnT = matHandler.start();
diff --git a/src/main/java/com/zy/asrs/task/handler/MatHandler.java b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
index ff1933e..cc85025 100644
--- a/src/main/java/com/zy/asrs/task/handler/MatHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/MatHandler.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.task.handler;
 
+import com.core.common.Cools;
 import com.zy.asrs.entity.Mat;
 import com.zy.asrs.entity.dto.MatnrCountDto;
 import com.zy.asrs.service.MatService;
@@ -38,7 +39,7 @@
     public ReturnT<String> start() {
         try {
             Date now = new Date();
-            List<MatnrCountDto> matnrCountDtos = jdbcTemplate.queryForList("select\n" +
+            List<Map<String, Object>> list = jdbcTemplate.queryForList("select\n" +
                     "matnr,\n" +
                     "count(1) as count\n" +
                     "from (\n" +
@@ -51,14 +52,17 @@
                     "\tand io_type not in (103,104,107)\n" +
                     "\tand (manu_type is null or manu_type != '鎵嬪姩鍙栨秷')\n" +
                     ") a\n" +
-                    "group by matnr", MatnrCountDto.class);
-            for (MatnrCountDto dto : matnrCountDtos) {
-                if (dto.getCount() >= 3) {
-                    Mat mat = matService.selectByMatnr(dto.getMatnr());
-                    mat.setInoutEveryday(Boolean.TRUE);
-                    mat.setUpdateTime(now);
-                    if (!matService.updateById(mat)) {
-                        log.error("{}鍟嗗搧淇敼涓洪珮棰戝睘鎬уけ璐ワ紒", dto.getMatnr());
+                    "group by matnr");
+            if (!Cools.isEmpty(list)) {
+                for (Map<String, Object> map : list) {
+                    MatnrCountDto dto = Cools.conver(map, MatnrCountDto.class);
+                    if (dto.getCount() >= 3) {
+                        Mat mat = matService.selectByMatnr(dto.getMatnr());
+                        mat.setInoutEveryday(Boolean.TRUE);
+                        mat.setUpdateTime(now);
+                        if (!matService.updateById(mat)) {
+                            log.error("{}鍟嗗搧淇敼涓洪珮棰戝睘鎬уけ璐ワ紒", dto.getMatnr());
+                        }
                     }
                 }
             }
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index d0e7a36..d903576 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -107,10 +107,10 @@
                 </if>
                 <choose>
                     <when test="inoutEveryday != null and inoutEveryday">
-                        AND bay1 &lt; 11
+                        AND bay1 &lt; 11 and lev1 in (2,3,4)
                     </when>
                     <otherwise>
-                        AND bay1 > 10
+                        AND (bay1 >= 11 or (bay1 &lt; 11 and lev1 in (1)))
                     </otherwise>
                 </choose>
                 and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')

--
Gitblit v1.9.1