Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java =================================================================== diff -u -r16761 -r17731 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java (.../TestPDAForeignTousseGoodsInvoiceManager.java) (revision 16761) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDAForeignTousseGoodsInvoiceManager.java (.../TestPDAForeignTousseGoodsInvoiceManager.java) (revision 17731) @@ -44,15 +44,15 @@ foreignTousseApplication.setApplicationTime(new Date()); foreignTousseApplication.setCommittedStatus(true); foreignTousseApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER); - foreignTousseApplication.setDepart(Constants.ORG_UNIT_NAME_OR); - foreignTousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_OR); - foreignTousseApplication.setHandleDepart(Constants.ORG_UNIT_NAME_OR); - foreignTousseApplication.setHandleDepartCoding(Constants.ORG_UNIT_CODE_OR); + foreignTousseApplication.setDepart(Constants.ORG_UNIT_NAME_NEIKE); + foreignTousseApplication.setDepartCoding(Constants.ORG_UNIT_CODE_NEIKE); + foreignTousseApplication.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD); + foreignTousseApplication.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE); foreignTousseApplication.setType(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); foreignTousseApplication.setSerialNumber("2014101700001"); - foreignTousseApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_OR); - foreignTousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_OR); + foreignTousseApplication.setSettleAccountsDepart(Constants.ORG_UNIT_NAME_NEIKE); + foreignTousseApplication.setSettleAccountsDepartCoding(Constants.ORG_UNIT_CODE_NEIKE); foreignTousseApplication.setPackageStatus(ForeignTousseApplication.RECYCLINGSTATUS_AWAITRECYCLE); objectDao.save(foreignTousseApplication); @@ -172,7 +172,7 @@ invoiceItems1.add(invoiceItems1_1); params.put("mode", "depart"); - params.put("departCode", Constants.ORG_UNIT_CODE_OR); + params.put("departCode", Constants.ORG_UNIT_CODE_NEIKE); params.put("assistantSender", "朱广兴"); params.put("sender", "朱广兴"); params.put("invoiceItems", invoiceItems1); @@ -235,7 +235,7 @@ private void prepareData(){ initCSSDData(); - makeActiveUser("oruser1"); + makeActiveUser("cssduser1"); //创建器械包定义 initBasicData(); createForeignTousseGoodsApplication();