Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java =================================================================== diff -u -r16709 -r16763 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 16709) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 16763) @@ -112,19 +112,7 @@ double tousseFluctionPrice = supplyRoomConfigManager.getTousseFluctuationPercent(); //一次性物品的浮动价格 double diposableGoodsFluctionPrice = supplyRoomConfigManager.getDisposableGoodsFluctuationPercent(); - //发货前的器械包二级库存 - DepartmentStock departmentStock = departmentStockManager.getByDepartCodingAndTousseName("3266", "Test开胸包"); - int departmentStockBeforeInvoice = 0; - if(departmentStock != null){ - departmentStockBeforeInvoice = departmentStock.getAmount(); - } - //发货前的库存量 - TousseStock stock_beforeInvoce = tousseStockManager.getTousseStockByTousseName("Test开胸包"); - int stockBeforeInvoice = 0; - if(stock_beforeInvoce != null){ - stockBeforeInvoice = stock_beforeInvoce.getTousseAmount(); - assertEquals(3, stockBeforeInvoice); - } + //测试库存 DisposableGoodsBatchStock batchStock = diposableGoodBatchStockManager .getDisposableGoodsBatchStockByNameAndBatchNumber(wareHouse_CSSD.getId(),"test10ml注射器","小号","1402180001"); @@ -150,11 +138,6 @@ //消毒物品的发货单 Invoice disinfectionGoodsInvoice = (Invoice)objectDao.getByProperty(Invoice.class.getSimpleName(), "invoicePlan.serialNumber", "2014101600001"); assertNotNull(disinfectionGoodsInvoice); - //发货后的库存量 - TousseStock stock_afterInvoice = tousseStockManager.getTousseStockByTousseName("Test开胸包"); - objectDao.getHibernateSession().refresh(stock_afterInvoice); - //发货后的部门二级库存量 - DepartmentStock departmentStock2 = departmentStockManager.getByDepartCodingAndTousseName("3266", "Test开胸包"); //断言发货单关联的包实例为3个 assertEquals(3 , simpleTousseInvoice.getTousseInstances(objectDao).size()); @@ -164,20 +147,13 @@ TousseInstance tousseInstance = tousseInstanceManager.getTousseInstanceByBarcode(barcode); assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_SHIPPED); } - //断言发货后的库存量与发货前的库存量相同 - if(stock_afterInvoice !=null){ - assertEquals(3 , stockBeforeInvoice - stock_afterInvoice.getTousseAmount().intValue()); - } //断言申请单状态为已发货 assertEquals(InvoicePlan.DELIVERSTATUS_DELIVERED , simpleTousseInvoice.getInvoicePlan().getDeliverStatus()); //断言发货单金额 assertEquals( 3.14*3 *tousseFluctionPrice , simpleTousseInvoice.getTotalPrice()); - //断言发货后的二级库存量与发货前的二级库存量多3个 - if(departmentStock2 != null){ - assertEquals(3 , departmentStock2.getAmount().intValue()-departmentStockBeforeInvoice); - } + /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~飘逸的分割线~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ BigDecimal decimal = new BigDecimal(diposableGoodsFluctionPrice); BigDecimal totalPrice = null;