Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp =================================================================== diff -u -r17150 -r19395 --- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp (.../goodsBindingConfigView.jsp) (revision 17150) +++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp (.../goodsBindingConfigView.jsp) (revision 19395) @@ -13,7 +13,6 @@ -<%----%> Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r19227 -r19395 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 19227) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 19395) @@ -944,7 +944,7 @@ if (StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay) && StringUtils.isNotBlank(departmentCode)) { - return jasperReportManager.getTousseSpecificationSizeStatisticsData(startDay, endDay, departmentCode); //这里 + return jasperReportManager.getTousseSpecificationSizeStatisticsData(startDay, endDay, departmentCode); } } return null; @@ -2654,6 +2654,11 @@ map.put("returnGoodsQuery", returnGoodsQuery); } + /** + * 判断是否为消毒物品.. + * @param goodsSearch 器械包名称 + * @return + */ private boolean isDisinfection(String goodsSearch) { boolean isDisinfection = false; //判断是否为消毒物品 Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (revision 19395) @@ -0,0 +1 @@ \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r19036 -r19395 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 19036) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 19395) @@ -402,7 +402,7 @@ .script("${ctx}/js/CookieManager.js") .script("${ctx}/disinfectsystem/common/cssdUtils.js").wait() - .script("goodsTemplateApplicationView.js").wait() + .script("goodsApplicationView.js").wait() .script("${ctx}/disinfectsystem/goodsBindingConfig/goodsBindHandler.js") .script("goodsAppHelper.js") Fisheye: Tag 19395 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js'. Fisheye: No comparison available. Pass `N' to diff?