From f9e742b17c47d9f0df3a56caa09f18c8f99aa3f8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 03 七月 2025 17:44:37 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocMastMapper.xml | 3 ++-
src/main/java/com/zy/common/service/CommonService.java | 2 +-
src/main/resources/license.lic | 0
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 8 ++++----
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
index 62b7596..d588645 100644
--- a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
@@ -21,10 +21,10 @@
public ReturnT<String> start() {
try {
// 鍒犻櫎鍗婂勾浠ヤ笂鐨勫巻鍙叉。
- jdbcTemplate.update("delete from asr_stk_hplc where dateadd(day,180,appe_time) <= getdate();");
- jdbcTemplate.update("delete from asr_wrk_detl_log where dateadd(day,360,appe_time) <= getdate();");
- jdbcTemplate.update("delete from asr_wrk_mast_log where dateadd(day,360,appe_time) <= getdate();");
- jdbcTemplate.update("delete from cust_wait_pakin_log where dateadd(day,360,appe_time) <= getdate();");
+ jdbcTemplate.update("delete from asr_stk_hplc where dateadd(day,1080,appe_time) <= getdate();");
+ jdbcTemplate.update("delete from asr_wrk_detl_log where dateadd(day,1080,appe_time) <= getdate();");
+ jdbcTemplate.update("delete from asr_wrk_mast_log where dateadd(day,1080,appe_time) <= getdate();");
+ jdbcTemplate.update("delete from cust_wait_pakin_log where dateadd(day,1080,appe_time) <= getdate();");
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d6b86f6..dbf44dd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -224,7 +224,7 @@
// 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
+ if (times < 6) {
times = times + 1;
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
}
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index e0cf76d..2a1b07a 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 45055b7..2244412 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -40,7 +40,8 @@
<select id="queryFreeLocMast" resultMap="BaseResultMap">
select top 1 *
from asr_loc_mast
- where loc_sts='O'
+ where row1=#{row}
+ and loc_sts='O'
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
--
Gitblit v1.9.1