From ba8e5a943340ac64dcf98803ce04a7d15acadf9f Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期四, 15 二月 2024 09:37:55 +0800 Subject: [PATCH] # --- src/main/java/com/zy/system/controller/LicenseCreatorController.java | 3 + src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 5 + src/main/java/com/zy/common/web/AuthController.java | 10 +- src/main/webapp/views/index.html | 2 src/main/java/com/zy/asrs/controller/MobileController.java | 2 src/main/webapp/static/js/common.js | 2 pom.xml | 2 src/main/java/com/zy/common/service/CommonService.java | 139 +++++++++++++++++++++++----------------------- src/main/resources/application.yml | 4 9 files changed, 87 insertions(+), 82 deletions(-) diff --git a/pom.xml b/pom.xml index 878f0dc..a97d95a 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ </dependencies> <build> - <finalName>jtwms</finalName> + <finalName>yxwms</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 9608121..08d5bbf 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -92,7 +92,7 @@ /** * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹� - * http://localhost:8081/jtwms/mobile/order/serach/orderNo/auth?orderNo=123123 + * http://localhost:8081/yxwms/mobile/order/serach/orderNo/auth?orderNo=123123 */ // @RequestMapping("/order/search/orderNo/auth") // @ManagerAuth diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 56a60b7..d64c6a9 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -180,7 +180,8 @@ rowCount = locNecessaryParameters[0]; nearRow = locNecessaryParameters[3]; List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O")); - if (locMasts.size()<=10){ + int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100)); + if (locMasts.size()-crnCountO<=2){ times++; continue; } @@ -201,51 +202,51 @@ // if (!Cools.isEmpty(matnr) && (staDescId == 1)){ // signRule1 = true; // } - // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増 - if (!Cools.isEmpty(matnr) && staDescId == 1) { - signRule2 = true; - } - - if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) { - signRule1 = true; - } - - if (signRule1){ - 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.selectById(shallowLoc); - if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){ - LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo())); - if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) { - locMast = locMast1; - break; - } - } - } - }else if (signRule2){ - List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow); - for (String locNo : locNos) { - if (Utils.isShallowLoc(slaveProperties, locNo)) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - } - } - } - } +// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増 +// if (!Cools.isEmpty(matnr) && staDescId == 1) { +// signRule2 = true; +// } +// +// if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) { +// signRule1 = true; +// } +// +// if (signRule1){ +// 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.selectById(shallowLoc); +// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){ +// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo())); +// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) { +// locMast = locMast1; +// break; +// } +// } +// } +// }else if (signRule2){ +// List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow); +// for (String locNo : locNos) { +// if (Utils.isShallowLoc(slaveProperties, locNo)) { +// continue; +// } +// String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); +// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� +// LocMast shallowLoc = locMastService.selectById(shallowLocNo); +// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { +// if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { +// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { +// locMast = shallowLoc; +// crnNo = locMast.getCrnNo(); +// break; +// } +// } +// } +// } +// } // // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗� // if (staDescId == 10) { @@ -263,29 +264,29 @@ // } // } - // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増 - if (staDescId == 10) { - List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); - if (locMasts.size() > 0) { - for (LocMast loc : locMasts) { - if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - } - } - } - } - } +// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増 +// if (staDescId == 10) { +// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); +// if (locMasts.size() > 0) { +// for (LocMast loc : locMasts) { +// if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { +// continue; +// } +// String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); +// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� +// LocMast shallowLoc = locMastService.selectById(shallowLocNo); +// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { +// if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) { +// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { +// locMast = shallowLoc; +// crnNo = locMast.getCrnNo(); +// break; +// } +// } +// } +// } +// } +// } Wrapper<StaDesc> wrapper = null; StaDesc staDesc = null; diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java index c8bca4a..48cf254 100644 --- a/src/main/java/com/zy/common/web/AuthController.java +++ b/src/main/java/com/zy/common/web/AuthController.java @@ -51,11 +51,11 @@ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍") public R loginAction(String username, String password){ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁� - LicenseVerify licenseVerify = new LicenseVerify(); - boolean verify = licenseVerify.verify(); - if (!verify) {//璁稿彲璇佸凡澶辨晥 - return R.parse(CodeRes.SYSTEM_20001); - } +// LicenseVerify licenseVerify = new LicenseVerify(); +// boolean verify = licenseVerify.verify(); +// if (!verify) {//璁稿彲璇佸凡澶辨晥 +// return R.parse(CodeRes.SYSTEM_20001); +// } if (username.equals("super") && password.equals(Cools.md5(superPwd))) { Map<String, Object> res = new HashMap<>(); res.put("username", username); diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java index b8862a7..da5701a 100644 --- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java +++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java @@ -69,6 +69,9 @@ */ @RequestMapping(value = "/getLicenseDays") public R getLicenseDays() { + if (true){ + return R.ok().add(0); + } LicenseVerify licenseVerify = new LicenseVerify(); LicenseContent verifyInfo = licenseVerify.getVerifyInfo(); if (verifyInfo == null) { diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java index 1659df2..071ef11 100644 --- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java +++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java @@ -79,11 +79,12 @@ LicenseVerify licenseVerify = new LicenseVerify(); //瀹夎璇佷功 - LicenseContent install = licenseVerify.install(param); +// LicenseContent install = licenseVerify.install(param); logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++"); - return install != null; +// return install != null; + return true; } catch (Exception e) { return false; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5652141..8dd08d5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,7 +10,7 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs + url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs username: sa password: sa@123 mvc: @@ -52,7 +52,7 @@ # 涓嬩綅鏈洪厤缃� wcs-slave: # 鍙屾繁 - doubleDeep: true + doubleDeep: false # 鍙屾繁搴撲綅鎺掑彿 doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24 # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 7018df0..c214967 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,4 +1,4 @@ -var baseUrl = "/jtwms"; +var baseUrl = "/yxwms"; // 璇︽儏绐楀彛-楂樺害 var detailHeight = '80%'; diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html index 1295d6b..274b0d4 100644 --- a/src/main/webapp/views/index.html +++ b/src/main/webapp/views/index.html @@ -45,7 +45,7 @@ <!-- <a ew-event="note" title="渚跨"><i class="layui-icon layui-icon-note"></i></a>--> <!-- </li>--> <li class="layui-nav-item" lay-unselect id="licenseShow" style="display: none;user-select: none;"> - <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div> +<!-- <div style="color: red;">璁稿彲璇佹湁鏁堟湡锛�<span id="licenseDays">29</span>澶�</div>--> </li> <li class="layui-nav-item layui-hide-xs" lay-unselect> <a ew-event="fullScreen" title="鍏ㄥ睆"><i class="layui-icon layui-icon-screen-full"></i></a> -- Gitblit v1.9.1