From d3234825d804a6a205dba1c6092acc8e29981b81 Mon Sep 17 00:00:00 2001
From: lfd <1>
Date: 星期四, 06 三月 2025 10:11:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 10 +++++++---
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 8 ++++----
2 files changed, 11 insertions(+), 7 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..c017e98 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,360,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 44de1f6..189bc19 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -341,9 +341,13 @@
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
}
- // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
- if (locTypeDto.getLocType1() == 1) {
- locTypeDto.setLocType1((short) 2);
+// // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+// if (locTypeDto.getLocType1() == 1) {
+// locTypeDto.setLocType1((short) 2);
+// return getLocNo(1, staDescId, source2StaNo, matNos, locTypeDto, times);
+// }
+ if ((times < rowCount+2) && (whsType==2 || whsType==4)) {
+ times = times + 1;
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
--
Gitblit v1.9.1