Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r12562 -r12574 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 12562) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 12574) @@ -671,19 +671,19 @@ } //发货计划列表 int supplyRoomType = 1; - String orgUntiCode = null; + String orgUntiCodes = null; if(StringUtils.isNotBlank(gorupId)){ PrintConfig config = printConfigManager.getPrintConfigById(gorupId); if(config != null){ String codeStr = config.getDepartCodes(); if(StringUtils.isNotBlank(codeStr)){ codeStr = codeStr.replaceAll(";", "','"); - orgUntiCode = "'" + codeStr + "'"; + orgUntiCodes = "'" + codeStr + "'"; } } } List invoicePlans = invoicePlanManager - .getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCode); + .getAwaitForRecyclingInvoicePlan(supplyRoomType,orgUntiCodes); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); if(invoicePlans != null){ @@ -2981,7 +2981,18 @@ }catch(Throwable e){ System.out.println(e); } - String mobileClientInfoFilePath = Path.getMobileClientInfoFilePath(type); + if(StringUtils.isBlank(type)){ + type="clientForAndroid"; + } + String webInfoPath = Path.getWebAppRoot(); + String path = webInfoPath; + if(webInfoPath != null){ + int end = webInfoPath.indexOf("WEB-INF"); + if( end != -1){ + path = webInfoPath.substring(0,end - 1); + } + } + String mobileClientInfoFilePath = path + "/mobileClient/" + type + ".json"; String mobileClientInfo = null; if(FileUtils.fileExist(mobileClientInfoFilePath)){