Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r19509 -r19515 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 19509) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 19515) @@ -5012,26 +5012,30 @@ if(tousseInstanceList.size() > 0){ for (TousseInstance tousseInstance : tousseInstanceList) { - String tousseName = tousseInstance.getTousseName(); - ApplicationGoodsVo vo = datas.get(tousseName); - if(vo == null){ - vo = new ApplicationGoodsVo(); - datas.put(tousseName, vo); - } - vo.setName(tousseName); - String showName = tousseName; - vo.setShowTousseName(showName); - vo.setDiposable(applicationItem.getDiposable()); - vo.setInvoicePlanType(invoicePlan.getType()); - vo.setGoodsType(tousseType); - vo.setCount(vo.getCount()+1); - if(applicationItem.getUrgentAmount() > 0){ - vo.setUrgentAmount(vo.getUrgentAmount() + 1); - } - vo.setApplicationAmount(vo.getApplicationAmount()+1); - vo.setBeforeToday(vo.isBeforeToday() || beforeToday); - vo.addInvoicePlanID(invoicePlan.getId()); - vo.addTousseItemId(invoicePlan.getId(), applicationItem.getId()); + if (tousseInstance.hasShipped()) { + continue; + } + String tousseName = tousseInstance.getTousseName(); + ApplicationGoodsVo vo = datas.get(tousseName); + if (vo == null) { + vo = new ApplicationGoodsVo(); + datas.put(tousseName, vo); + } + vo.setName(tousseName); + String showName = tousseName; + vo.setShowTousseName(showName); + vo.setDiposable(applicationItem.getDiposable()); + vo.setInvoicePlanType(invoicePlan.getType()); + vo.setGoodsType(tousseType); + vo.setCount(vo.getCount() + 1); + if (applicationItem.getUrgentAmount() > 0) { + vo.setUrgentAmount(vo.getUrgentAmount() + 1); + } + vo.setApplicationAmount(vo.getApplicationAmount() + 1); + vo.setBeforeToday(vo.isBeforeToday() || beforeToday); + vo.addInvoicePlanID(invoicePlan.getId()); + vo.addTousseItemId(invoicePlan.getId(), + applicationItem.getId()); } continue; }