From a1c235841ddeef9159092a0c261dfc298058743c Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 16 七月 2024 10:11:42 +0800 Subject: [PATCH] # 出库确认 --- src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 62 +++++++++++++++--------------- src/main/java/com/zy/asrs/controller/MobileController.java | 2 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java index 67a2145..390c72f 100644 --- a/src/main/java/com/zy/asrs/controller/MobileController.java +++ b/src/main/java/com/zy/asrs/controller/MobileController.java @@ -219,7 +219,7 @@ } String[] batch1 = batch.split("绠卞彿锛�"); String[] batch2 = batch1[1].split("瑙勬牸锛�"); - batch = batch2[0]; + batch = batch2[0].replaceAll(" ", ""); // List<Order> orders = orderService.selectorderNoL(batch); WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch); // WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false)); 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 4e85844..b8eb0c7 100644 --- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java +++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java @@ -123,37 +123,37 @@ protected synchronized void validate(final LicenseContent content) throws LicenseContentException { //1. 棣栧厛璋冪敤鐖剁被鐨剉alidate鏂规硶 - super.validate(content); - - //2. 鐒跺悗鏍¢獙鑷畾涔夌殑License鍙傛暟 - //License涓彲琚厑璁哥殑鍙傛暟淇℃伅 - LicenseCheck expectedCheckModel = (LicenseCheck) content.getExtra(); - //褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅 - LicenseCheck serverCheckModel = getServerInfos(); - - 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搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); - } - }else{ - throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�"); - } + //super.validate(content); + // + ////2. 鐒跺悗鏍¢獙鑷畾涔夌殑License鍙傛暟 + ////License涓彲琚厑璁哥殑鍙傛暟淇℃伅 + //LicenseCheck expectedCheckModel = (LicenseCheck) content.getExtra(); + ////褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅 + //LicenseCheck serverCheckModel = getServerInfos(); + // + //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搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴"); + // } + //}else{ + // throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�"); + //} } -- Gitblit v1.9.1