Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r22595 -r22625 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 22595) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 22625) @@ -9143,7 +9143,7 @@ while (rs.next()) { //排除掉已经全部签收的单 if(getWaitSignTousseAmountByInvoiceId(rs.getLong("id"))==0){ - break; + continue; } Map map = new HashMap(); map.put("id", StringTools.defaultString(rs.getString("id"))); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r22593 -r22625 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 22593) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 22625) @@ -2465,16 +2465,19 @@ } } + //获取今天待签收的发货单(针对当前登入科室) public void getTodayWaitSignInvoiceGrid(){ List> invoiceList = invoiceManager.getTodayWaitSignInvoice(AcegiHelper.getCurrentOrgUnitCode()); PageUtil.outPutResult(PageUtil.getPagePara(), invoiceList); } + //获取今天待签收的发货单数量(针对当前登入科室) public void getTodayWaitSignInvoiceAmount(){ List> invoiceList = invoiceManager.getTodayWaitSignInvoice(AcegiHelper.getCurrentOrgUnitCode()); StrutsResponseUtils.output(true, invoiceList.size()+""); } + //根据发货单ID获取下面的待签收的包实例 public void getWaitSignTousseGridByInvoiceId(){ Long invoiceId = StrutsParamUtils.getPraramLongValue("invoiceId", null); //搜索的内容