From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作下线账号
---
src/main/java/com/zy/common/service/CommonService.java | 83 +++++++++++------------------------------
1 files changed, 22 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6eeffa5..7911829 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,8 +137,12 @@
*/
@Transactional
public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ long start = System.currentTimeMillis();
+ int tagId = 0;
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
+ }else{
+ tagId = matService.getTagIdByMatnr(matnr);
}
if (Cools.isEmpty(batch)) { //绠卞彿
batch = "";
@@ -159,8 +163,6 @@
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
int crnNumber = rowLastno.getCrnQty();
-
- int tagId = matService.getTagIdByMatnr(matnr);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -191,9 +193,9 @@
times++;
}
}
-// if (nearRow == 0) {
-// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
-// }
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
boolean signRule1 = false;
boolean signRule2 = false;
@@ -253,21 +255,7 @@
}
}
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
-// for (LocMast locMast1:locMasts){
-// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
-// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
-// locMast = locMast1;
-// break;
-// }
-// }
-// }
+
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
@@ -330,7 +318,7 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = null;
- if(sourceStaNo % 100 > 10){
+ if(sourceStaNo % 100 > 11){
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O")
@@ -341,29 +329,7 @@
.eq("loc_sts", "O")
.orderBy("lev1",true).orderBy("bay1",true));
}
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("row1", nearRow)
-// .eq("loc_sts", "O")
-// .orderBy("lev1",true).orderBy("bay1",true));
-// for (LocMast locMast1 : locMasts) {
-// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// if (Utils.BooleanWhsTypeStaIoType(whsType)){
-//// String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
-// .eq("loc_sts", "O"));
-// if (!Cools.isEmpty(locMast2)) {
-// locMast = locMast2;
-// break;
-// }
-// } else {
-// if (!Cools.isEmpty(locMast1)) {
-// locMast = locMast1;
-// break;
-// }
-// }
-// }
+
if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(whsType)){
if(tagId == 226){
@@ -375,17 +341,16 @@
}
}
locMasts = filteredLocMasts;
+ }else{
+ List<LocMast> filteredLocMasts = new ArrayList<>();
+ for (LocMast loc : locMasts) {
+ Integer lev = loc.getLev1();
+ if (lev != null && lev >= 1 && lev <= 5) {
+ filteredLocMasts.add(loc);
+ }
+ }
+ locMasts = filteredLocMasts;
}
-// if(tagId == 226){ //鍘熸潗鏂欐瘺鑳氱瓑
-// List<LocMast> filteredLocMasts = new ArrayList<>();
-// for (LocMast loc : locMasts) {
-// Integer lev = loc.getLev1();
-// if (lev != null && lev >= 1 && lev <= 5) {
-// filteredLocMasts.add(loc);
-// }
-// }
-// locMasts = filteredLocMasts;
-// }
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
@@ -411,14 +376,8 @@
times = times + 1;
return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo+1, locTypeDto, times);
}
-// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-// if (locTypeDto.getLocType1() < 2) {
-// int i = locTypeDto.getLocType1() + 1;
-// locTypeDto.setLocType1((short)i);
-// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
-// }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
+ throw new CoolException("娌℃湁绌哄簱浣嶆垨鍫嗗灈鏈哄紓甯�");
}
String locNo = locMast.getLocNo();
@@ -429,6 +388,8 @@
startupDto.setCrnNo(crnNo);
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
+ log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
+
return startupDto;
}
}
--
Gitblit v1.9.1