Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r40370 -r40516 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40370) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 40516) @@ -965,9 +965,9 @@ } } //zsyy-377 增加对包实例查询的日期范围限制 - String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry")); + String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry_ProdTime")); if(defaultQueryStartDateAndEndDateArray != null){ - tousseInstanceHql = String.format("%s and sterileEndTime between '%s' and '%s'", tousseInstanceHql,defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59"); + tousseInstanceHql = String.format("%s and operationTime between '%s' and '%s'", tousseInstanceHql,defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59"); } if(StringUtils.isNotEmpty(tousseInstanceHql)) { tousseInstanceHql = String.format(" from %s po where %s ", @@ -1099,10 +1099,10 @@ ResultSet rs = null; try { //zsyy-377 增加对包实例查询的日期范围限制 - String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry")); + String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry_ProdTime")); if(defaultQueryStartDateAndEndDateArray != null){ sql = String.format(sql, - String.format(" and sterileEndTime between '%s' and '%s' ",defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59")); + String.format(" and operationTime between '%s' and '%s' ",defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59")); }else{ sql = String.format(sql, ""); } @@ -3221,10 +3221,10 @@ ); try { //zsyy-377 增加对包实例查询的日期范围限制 - String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry")); + String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("invoicePlan_inventoryInquiry_ProdTime")); if(defaultQueryStartDateAndEndDateArray != null){ querySql = String.format(querySql, - String.format(" and sterileEndTime between '%s' and '%s' ",defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59")); + String.format(" and operationTime between '%s' and '%s' ",defaultQueryStartDateAndEndDateArray[0], defaultQueryStartDateAndEndDateArray[1] + " 23:59:59")); }else{ querySql = String.format(querySql, ""); }