From a2b65545aaf06ab33560e340eb6a88d7800d938c Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 25 七月 2024 16:24:35 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/LocDetl.java | 4 ++ src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 36 +++++++++--------- src/main/java/com/zy/common/service/CommonService.java | 15 ++++--- src/main/resources/application.yml | 6 ++ 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index 1a68af5..0e32867 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -250,9 +250,13 @@ } public long getStoreDate(){ + if (Cools.isEmpty(this.appeTime)){ + this.appeTime = new Date(); + } long timeNow = new Date().getTime(); long timeCreate = this.appeTime.getTime(); + return (timeNow - timeCreate) /24/60/60/1000; } diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index e4003f1..15bb57b 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -1007,14 +1007,14 @@ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { continue; } - if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ - //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 - LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); - if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) { - locMast = locMast2; +// if (Utils.BooleanWhsTypeStaIoType(rowLastno)){ +// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 +// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue()); +// if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) { + locMast = locMast1; break; - } - } +// } +// } } } @@ -1023,6 +1023,7 @@ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊 if (times < rowCount*2) { times = times + 1; + return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times); } log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java index 1ad2cc1..27d83af 100644 --- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java +++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java @@ -128,24 +128,24 @@ if(expectedCheckModel != null && serverCheckModel != null){ //鏍¢獙IP鍦板潃 - if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ - throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�"); - } - - //鏍¢獙Mac鍦板潃 - if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ - throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�"); - } - - //鏍¢獙涓绘澘搴忓垪鍙� - if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ - throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); - } - - //鏍¢獙CPU搴忓垪鍙� - if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ - throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); - } +// if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){ +// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�"); +// } +// +// //鏍¢獙Mac鍦板潃 +// if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){ +// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�"); +// } +// +// //鏍¢獙涓绘澘搴忓垪鍙� +// if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){ +// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); +// } +// +// //鏍¢獙CPU搴忓垪鍙� +// if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){ +// throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); +// } }else{ throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�"); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7f5c157..b55115c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -99,4 +99,8 @@ acctID: "647e849ab6fa0f" username: "llw" password: "666666" - lcid: 2052 \ No newline at end of file + lcid: 2052 + +agv: + url: "" + taskCreatePath: "" \ No newline at end of file -- Gitblit v1.9.1