Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/diposablegoods/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/diposablegoods/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/diposablegoods/AllTests.xml (revision 16829) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json (revision 0) +++ ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json (revision 16829) @@ -0,0 +1,906 @@ +{ + TestCases: [ + { + caseDescriptionA: "A：物品项状态为：不需回收，未终止", + caseDescriptionB: "B：物品项状态为：不需回收，已终止", + caseDescriptionC: "C：物品项状态为：需回收，未回收，未终止", + caseDescriptionD: "D：物品项状态为：需回收，未回收，已终止", + caseDescriptionE: "E：物品项状态为：需回收，已回收，未终止", + caseDescriptionF: "F：物品项状态为：需回收，已回收，已终止", + + caseName: "caseRecyclingStatusA", + expectedRecyclingStatus: null, + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusB", + expectedRecyclingStatus: null, + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusC", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusD", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusE", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusF", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusAA", + expectedRecyclingStatus: null, + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusAB", + expectedRecyclingStatus: null, + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusAC", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusAD", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusAE", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusAF", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusBB", + expectedRecyclingStatus: null, + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true}, + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusBC", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusBD", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusBE", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusBF", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "敷料包", tousseName: "Test治疗巾", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusCC", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusCD", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusCE", + expectedRecyclingStatus: "部分回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusCF", + expectedRecyclingStatus: "待回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusDD", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusDE", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusDF", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: null, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusEE", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseRecyclingStatusEF", + expectedRecyclingStatus: "已回收", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: false}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseRecyclingStatusFF", + expectedRecyclingStatus: "已终止", + InvoicePlan: { type : "通用申请单"}, + TousseItems: [ + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true}, + { tousseType: "器械包", tousseName: "Test开胸包", recyclingAmount: 1, isTerminated: true} + ] + } + + ,{ + caseDescriptionA: "A：物品项状态为：无需发货，未终止", + caseDescriptionB: "B：物品项状态为：无需发货，已终止", + caseDescriptionC: "C：物品项状态为：未发货，未终止", + caseDescriptionD: "D：物品项状态为：未发货，已终止", + caseDescriptionE: "E：物品项状态为：部分发货，未终止", + caseDescriptionF: "F：物品项状态为：部分发货，已终止", + caseDescriptionG: "G：物品项状态为：已发货，未终止", + caseDescriptionH: "H：物品项状态为：已发货，已终止", + + caseName: "caseDeliverStatusA", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusB", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusC", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusD", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + } + + ,{ + caseName: "caseDeliverStatusAA", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusAB", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusAC", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusAD", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusAE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusAF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusAG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusAH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + } + ,{ + caseName: "caseDeliverStatusBB", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusBC", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusBD", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusBE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusBF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusBG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusBH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + } + ,{ + caseName: "caseDeliverStatusCC", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusCD", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusCE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusCF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusCG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusCH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "待发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusDD", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusDE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusDF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusDG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusDH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusEE", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusEF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusEG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusEH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "部分发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusFF", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusFG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusFH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusGG", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseDeliverStatusGH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已发货", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseDeliverStatusHH", + InvoicePlan: { type : "通用申请单"}, + expectedDeliverStatus: "已终止", + TousseItems: [ + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true}, + { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true} + ] + } + + ,{ + caseName: "caseEndStatus00", + InvoicePlan: { type : "通用申请单"}, + expectedEndStatus: null, + TousseItems: [ + { isTerminated: false}, + { isTerminated: false} + ] + },{ + caseName: "caseEndStatus01", + InvoicePlan: { type : "通用申请单"}, + expectedEndStatus: "部分终止", + TousseItems: [ + { isTerminated: false}, + { isTerminated: true} + ] + },{ + caseName: "caseEndStatus11", + InvoicePlan: { type : "通用申请单"}, + expectedEndStatus: "已终止", + TousseItems: [ + { isTerminated: true}, + { isTerminated: true} + ] + } + + ,{ + caseDescriptionA: "A：物品项状态为：未发货，未终止", + caseDescriptionB: "B：物品项状态为：未发货，已终止", + caseDescriptionC: "C：物品项状态为：未归还（已发货），未终止", + caseDescriptionD: "D：物品项状态为：未归还（已发货），已终止", + caseDescriptionE: "E：物品项状态为：部分归还，未终止", + caseDescriptionF: "F：物品项状态为：部分归还，已终止", + caseDescriptionG: "G：物品项状态为：已归还，未终止", + caseDescriptionH: "H：物品项状态为：已归还，已终止", + + caseName: "caseReturnStatusAA", + expectedReturnStatus: null, + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusAB", + expectedReturnStatus: null, + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusAC", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusAD", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusAE", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusAF", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusAG", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusAH", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusBB", + expectedReturnStatus: null, + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusBC", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusBD", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusBE", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusBF", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusBG", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusBH", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusCC", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusCD", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusCE", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusCF", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusCG", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusCH", + expectedReturnStatus: "未归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusDD", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusDE", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusDF", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusDG", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusDH", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusEE", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusEF", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusEG", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusEH", + expectedReturnStatus: "部分归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusFF", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusFG", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusFH", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusGG", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false} + ] + },{ + caseName: "caseReturnStatusGH", + expectedReturnStatus: "已归还", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + },{ + caseName: "caseReturnStatusHH", + expectedReturnStatus: "已终止", + InvoicePlan: {type: "借物单"}, + TousseItems: [ + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true}, + { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true} + ] + } + ] +} \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/serialNumber/service/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/common/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/common/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/common/AllTests.xml (revision 16829) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java1 =================================================================== diff -u --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java1 (revision 0) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java1 (revision 16829) @@ -0,0 +1,1034 @@ +package test.forgon.disinfectsystem.packing; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.lang.Thread.State; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeoutException; + +import javax.servlet.http.HttpSession; + +import net.jodah.concurrentunit.Waiter; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.TransactionStatus; +import org.springframework.transaction.support.DefaultTransactionDefinition; +import org.testng.annotations.Test; + +import test.forgon.disinfectsystem.AbstractCSSDTest; + +import com.forgon.disinfectsystem.barcode.service.BarcodeManager; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.disinfectsystem.entity.packing.PackingRecord; +import com.forgon.disinfectsystem.entity.packing.PackingTask; +import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyDisinfection; +import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem; +import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.packing.dwr.table.PackingTableManager; +import com.forgon.disinfectsystem.packing.service.PackingManager; +import com.forgon.disinfectsystem.sterilizationmanager.foreignproxydisinfection.service.ForeignProxyDisinfectionManager; + +/** + * @author Terry Kwan + * @date 2014-10-11 + */ +public class PackingTableManagerTests extends AbstractCSSDTest { + + private static final Logger logger = Logger + .getLogger(PackingTableManagerTests.class); + final Waiter waiter = new Waiter(); + + @Autowired + private PlatformTransactionManager txManager; + + @Autowired + private PackingTableManager packingTableManager; + @Autowired + private ForeignProxyDisinfectionManager foreignProxyDisinfectionManager; + @Autowired + private PackingManager packingManager; + @Autowired + private BarcodeManager barcodeManager; + + /** + * 为了便于在子线程中访问装配任务，定义此全局的装配任务变量 + */ + PackingTask globalPackingTask; + + private int unpackAmount; + + + int maxRunTime = 10 * 60 * 1000; // 60分钟 + + private static final int MAX_THREADS = 1; + private static final int invokeCount = 1; + + /** + * 每次装配的数量 + */ + int amountPerPack = 100; + + public int getUnpackAmount() { + return unpackAmount; + } + public void setUnpackAmount(int unpackAmount) { + this.unpackAmount = unpackAmount; + } + + /** + * 并发调用该方法，验证死锁是否会发生 + * @throws Exception + * + */ + @Test + public void testFindPackingRecordTableListConcurrent() throws Exception { + + initDataInSeperateThread(); + + Map>[] parameterMap = new HashMap[MAX_THREADS]; + + ArrayList listStatus = new ArrayList(); + listStatus.add("待装配"); + + ArrayList listOrGroup = new ArrayList(); + listOrGroup.add("OR器械包组"); + + for (int i = 0; i < MAX_THREADS; i++) { + parameterMap[i] = new HashMap>(); + parameterMap[i].put("parm_s_status", listStatus); + parameterMap[i].put("parm_s_taskGroup", listOrGroup); + } + + makeActiveUser("cssduser1"); + + PackingTableManagerInvokerThread[] packingTousseThreads = new PackingTableManagerInvokerThread[MAX_THREADS]; + for (int i=0;i maxRunTime) { + fail("测试用例运行时间为" + runningTime + "ms，超过允许的最长时间" + + maxRunTime + "ms, 可能有线程死锁，请检查！"); + System.exit(0); + } + } + + long t3 = System.currentTimeMillis(); + + logger.info("测试用例运行花费时间： " + (t3 - t1) + " ms"); + + } catch (Exception e) { + e.printStackTrace(); + } + + } + public void init() throws Exception { + +// springTestContextPrepareTestInstance(); + TransactionStatus tx = null; + try { + tx = txManager.getTransaction(new DefaultTransactionDefinition()); + + // do test + initCSSDData(); + makeActiveUser("cssduser1"); + + // 创建Test开胸包的装配任务 + TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + assertNotNull(td); + + // 关闭该器械包的自动入筐功能 + td.setPackingAmountPerVirtualBasket(0); + objectDao.saveOrUpdate(td); + + globalPackingTask = packingManager.createPackingTask(td, 4000000,Long.valueOf(1),1,"010000116","清洗筐16",""); + assertNotNull(globalPackingTask); + + PackingTask found = packingManager.getPackingTaskById(globalPackingTask.getId() + ""); + + assertNotNull(found); + + assertEquals(globalPackingTask.getId(), found.getId()); + + assertEquals("4000000", "" + found.getAmount()); + + + txManager.commit(tx); + } + finally{ + //txManager.rollback(tx); + } + } + + @Test + public void testPackingTousseConcurrent() throws Exception{ + initDataInSeperateThread(); + + for (int i =0 ; i< MAX_THREADS ;i++){ + new Thread(){ + public void run() { + for (int j=0;j tousseInstances = new LinkedList(); + + ForeignProxyDisinfection foreignProxyDisinfection = new ForeignProxyDisinfection(); + TousseItem tousseItem = new TousseItem(); + + ForeignProxyItem item = new ForeignProxyItem(); + + item.setTousseName(tousseName); + item.setCount(count); + item.setBasketBarcode(basketBarcode); + item.setPackageType(packageType); + + objectDao.save(item); + + TousseDefinition tousseDefinition = tousseDefinitionManager + .getTousseDefinitionByNameAndTousseType(tousseName, + TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); + + try { + foreignProxyDisinfectionManager + .createForeignProxyDisinfectionTousseInstances(tousseDefinition, + packageType, sterilingType, count, + basketBarcode,tousseInstances,item,foreignProxyDisinfection,tousseItem); + } catch (Exception e) { + e.printStackTrace(); + } + } + waiter.resume(); + } + }.start(); + } + + // 线程运行的超时时间设置为5分钟 + waiter.await(5 * 60 * 1000, MAX_THREADS); + + + totalTousses = objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sql); + + assertEquals(MAX_THREADS * invokeCount * amountPerPack, totalTousses); + } + + @Test + public void testPackTousseAndForeignProxyDisinfectionConcurrent() throws TimeoutException { + initDataInSeperateThread(); + + String tousseName = "4#压力蒸汽灭菌包"; + + String sql = "where po.tousseName = '" + tousseName + "'"; + int totalTousses = objectDao.countObjectBySql(TousseInstance.class.getSimpleName(), sql); + + assertEquals(0, totalTousses); + + for (int i =0 ; i< MAX_THREADS ;i++){ + new Thread(){ + public void run() { + for (int j=0;j tousseInstances = new LinkedList(); + + ForeignProxyDisinfection foreignProxyDisinfection = new ForeignProxyDisinfection(); + TousseItem tousseItem = new TousseItem(); + + ForeignProxyItem item = new ForeignProxyItem(); + + item.setTousseName(tousseName); + item.setCount(count); + item.setBasketBarcode(basketBarcode); + item.setPackageType(packageType); + + objectDao.save(item); + + TousseDefinition tousseDefinition = tousseDefinitionManager + .getTousseDefinitionByNameAndTousseType(tousseName, + TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY); + + try { + foreignProxyDisinfectionManager + .createForeignProxyDisinfectionTousseInstances(tousseDefinition, + packageType, sterilingType, count, + basketBarcode,tousseInstances,item,foreignProxyDisinfection,tousseItem); + } catch (Exception e) { + e.printStackTrace(); + } + } + waiter.resume(); + } + }.start(); + } + + + for (int i =0 ; i< MAX_THREADS ;i++){ + new Thread(){ + public void run() { + for (int j=0;j tousseInstances = packingRecord.getTousseInstanceList(objectDao); + + assertNotNull(tousseInstances); + assertEquals(600, tousseInstances.size()); + + assertEquals("Test开胸包", tousseInstances.get(20).getTousseName()); + assertEquals("棉布", tousseInstances.get(20).getPackageType()); + + packingTask = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + assertNull(packingTask); // 装配任务完成后被删除 + + + // 第二种场景配包 + packingTaskIds = packingTask2.getId().toString(); + packageType = "无纺布"; + sterilingType = "P2"; + packAmountStr = "200"; + taskGroup = "治包2组"; + splitPackage = null; + basketBarcode = "010000110"; + idCardBarcode = ""; + sterilizer = "2号灭菌炉"; + frequency = "4"; + JSONObject packingParams = new JSONObject(); + packingParams.put("taskIds", packingTaskIds); + packingParams.put("inspector", inspector); + packingParams.put("inspectorCode", inspectorCode); + packingParams.put("operator", operator); + packingParams.put("operatorCode", operatorCode); + packingParams.put("reviewer", reviewer); + packingParams.put("reviewerCode", reviewerCode); + packingParams.put("wrapper", wrapper); + packingParams.put("wrapperCode", wrapperCode); + packingParams.put("packageType", packageType); + packingParams.put("sterilingType", sterilingType); + packingParams.put("sterileDate", sterileDateStr); + packingParams.put("stock", stock); + packingParams.put("packAmount", packAmountStr); + packingParams.put("taskGroup", taskGroup); + packingParams.put("splitPackage", splitPackage); + packingParams.put("basketBarcode", basketBarcode); + packingParams.put("idCardInstanceID", idCardBarcode); + packingParams.put("sterilizer", sterilizer); + packingParams.put("frequency", frequency); + packingParams.put("confirmContinue", "true"); + packingParams.put("urgentAmount", null); + packingParams.put("tousseWeight", ""); + str = packingTableManager.packingTousse2(packingParams.toString(), session); + + json = JSONObject.fromObject(str); + assertTrue(json.optBoolean("success")); + + + tousses = json.optJSONArray("tousses"); + + assertNotNull(tousses); + + assertEquals(200, tousses.size()); + + tousseObj = tousses.getJSONObject(100); + + barcodes = tousseObj.optJSONArray("barcodes"); + + assertNotNull(barcodes); + assertEquals(1, barcodes.size()); + + assertEquals("Test治疗巾", tousseObj.opt("tousseName")); + assertEquals("测试外科", tousseObj.opt("department")); + + barcodes = tousseObj.optJSONArray("barcodes"); + + tousseInstance = (TousseInstance)barcodeManager + .getBarcodeByBarcode(barcodes.getString(0)); + + packingRecord = packingManager.getPackingRecordByTousseInstance(tousseInstance); + + assertNotNull(packingRecord); + + assertEquals("cssduser1", packingRecord.getPacker()); + assertEquals("Test治疗巾", packingRecord.getTousseName()); + assertEquals("敷料包", packingRecord.getTousseType()); + + assertEquals(200, packingRecord.getAmount().intValue()); + + assertEquals("治包2组", packingRecord.getTaskGroup()); + //assertEquals("否", packingRecord.getIsTraceable()); + + assertEquals("2号灭菌炉", packingRecord.getSterilizer()); + assertEquals("4", packingRecord.getFrequency()); + + assertTrue(tousseObj.optBoolean("isPrint")); + assertFalse(tousseObj.optBoolean("isDisinfection")); + assertFalse(tousseObj.optBoolean("printExpirationDate")); + + tousseInstances = packingRecord.getTousseInstanceList(objectDao); + + assertNotNull(tousseInstances); + assertEquals(200, tousseInstances.size()); + + assertEquals("Test治疗巾", tousseInstances.get(20).getTousseName()); + assertEquals("无纺布", tousseInstances.get(20).getPackageType()); + assertEquals("已装配", tousseInstances.get(20).getStatus()); + assertEquals("cssduser1", tousseInstances.get(20).getOperator()); + assertEquals("002107", tousseInstances.get(20).getOperatorCode()); + assertNotNull(tousseInstances.get(20).getOperationTime()); + + packingTask2 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td2.getId(), 1); + assertNotNull(packingTask2); + assertEquals(29800, packingTask2.getUnPackAmount().intValue()); + } + + /** + * 测试不需要审核的器械包的装配是否正常 + * + */ + @Test + public void testPackingTousseWhichDoNotNeedAudit() { + initCSSDData(); + + // 创建Test开胸包的装配任务 + TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + + // 设置为不需要审核 + td.setIsReview(TousseDefinition.STR_NO); + objectDao.save(td); + + PackingTask packingTask = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + + assertNull(packingTask); + + packingManager.createPackingTask(td, 600,Long.valueOf(1),1,"010000116","清洗筐16","测试内科"); + + packingTask = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + + assertNotNull(packingTask); + + assertEquals(600, packingTask.getAmount().intValue()); + assertEquals(600, packingTask.getUnPackAmount().intValue()); + assertEquals("测试内科", packingTask.getDepartment()); + + + // 配包 + String packingTaskIds = packingTask.getId().toString(); + String inspector = "cssduser1"; + String inspectorCode = "002107"; + String operator = "cssduser1"; + String operatorCode = "002107"; + String reviewer = "cssduser2"; + String reviewerCode = "fw130"; + String wrapper = "cssduser2"; + String wrapperCode = "fw130"; + String packageType = "棉布"; + String sterilingType = "P1器械"; + String sterileDateStr = new Date().getTime() + ""; + String stock = ""; + String packAmountStr = "600"; + String taskGroup = "治包1组"; + String splitPackage = null; + String basketBarcode = "010000110"; + String idCardBarcode = ""; + String sterilizer = "1号灭菌炉"; + String frequency = "3"; + HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), session); + + JSONObject json = JSONObject.fromObject(str); + assertTrue(json.optBoolean("success")); + JSONArray tousses = json.optJSONArray("tousses"); + + assertNotNull(tousses); + assertEquals(600, tousses.size()); + + JSONObject tousseObj = tousses.getJSONObject(0); + + assertEquals("Test开胸包", tousseObj.opt("tousseName")); + assertEquals("测试内科", tousseObj.opt("department")); + + JSONArray barcodes = tousseObj.optJSONArray("barcodes"); + + assertNotNull(barcodes); + assertEquals(1, barcodes.size()); + + TousseInstance tousseInstance = (TousseInstance)barcodeManager + .getBarcodeByBarcode(barcodes.getString(0)); + + assertNotNull(tousseInstance); + + PackingRecord packingRecord = packingManager.getPackingRecordByTousseInstance(tousseInstance); + + assertNotNull(packingRecord); + + assertEquals("cssduser1", packingRecord.getPacker()); + assertEquals("Test开胸包", packingRecord.getTousseName()); + assertEquals("器械包", packingRecord.getTousseType()); + + assertEquals(600, packingRecord.getAmount().intValue()); + + assertEquals("治包1组", packingRecord.getTaskGroup()); +// assertEquals("是", packingRecord.getIsTraceable()); + + assertEquals("1号灭菌炉", packingRecord.getSterilizer()); + assertEquals("3", packingRecord.getFrequency()); + + assertTrue(tousseObj.optBoolean("isPrint")); + assertFalse(tousseObj.optBoolean("isDisinfection")); + assertFalse(tousseObj.optBoolean("printExpirationDate")); + + List tousseInstances = packingRecord.getTousseInstanceList(objectDao); + + assertNotNull(tousseInstances); + assertEquals(600, tousseInstances.size()); + + TousseInstance tousseInstance2 = tousseInstances.get(20); + + assertEquals("Test开胸包", tousseInstance2.getTousseName()); + assertEquals("棉布", tousseInstance2.getPackageType()); + assertEquals("已审核", tousseInstance2.getStatus()); + + assertNotNull(tousseInstance2.getReviewTime()); + assertEquals(tousseInstance2.getOperationTime(), tousseInstance2.getReviewTime()); + + assertEquals("cssduser2", tousseInstance2.getReviewer()); + assertEquals("fw130", tousseInstance2.getReviewerCode()); + + packingTask = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + assertNull(packingTask); // 装配任务完成后被删除 + + + } + + + @Test + public void testMultiPackingTasks(){ + initCSSDData(); + + // 创建Test开胸包的装配任务 + TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + + PackingTask packingTask1 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + + assertNull(packingTask1); + + packingTask1 = packingManager.createPackingTask(td, 10,Long.valueOf(1),1,"010000116","清洗筐16","测试内科"); + + packingTask1 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + + assertNotNull(packingTask1); + + assertEquals(10, packingTask1.getAmount().intValue()); + assertEquals(10, packingTask1.getUnPackAmount().intValue()); + assertEquals("测试内科", packingTask1.getDepartment()); + + PackingTask packingTask2 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000117", td.getId(), 1); + + assertNull(packingTask2); + + packingTask2 = packingManager.createPackingTask(td, 20,Long.valueOf(1),1,"010000117","清洗筐16","测试外科"); + + packingTask2 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000117", td.getId(), 1); + + assertNotNull(packingTask2); + + assertEquals(20, packingTask2.getAmount().intValue()); + assertEquals(20, packingTask2.getUnPackAmount().intValue()); + + // 第一种场景配包 + + String packingTaskIds = packingTask1.getId().toString() + ";" + packingTask2.getId().toString(); + String inspector = "cssduser1"; + String inspectorCode = "002107"; + String operator = "cssduser1"; + String operatorCode = "002107"; + String reviewer = "cssduser2"; + String reviewerCode = "fw130"; + String wrapper = "cssduser2"; + String wrapperCode = "fw130"; + String packageType = "棉布"; + String sterilingType = "P1器械"; + String sterileDateStr = new Date().getTime() + ""; + String stock = ""; + String packAmountStr = "30"; + String taskGroup = "治包1组"; + String splitPackage = null; + String basketBarcode = "010000110"; + String idCardBarcode = ""; + String sterilizer = "1号灭菌炉"; + String frequency = "3"; + HttpSession session = null; + JSONObject params = new JSONObject(); + params.put("taskIds", packingTaskIds); + params.put("inspector", inspector); + params.put("inspectorCode", inspectorCode); + params.put("operator", operator); + params.put("operatorCode", operatorCode); + params.put("reviewer", reviewer); + params.put("reviewerCode", reviewerCode); + params.put("wrapper", wrapper); + params.put("wrapperCode", wrapperCode); + params.put("packageType", packageType); + params.put("sterilingType", sterilingType); + params.put("sterileDate", sterileDateStr); + params.put("stock", stock); + params.put("packAmount", packAmountStr); + params.put("taskGroup", taskGroup); + params.put("splitPackage", splitPackage); + params.put("basketBarcode", basketBarcode); + params.put("idCardInstanceID", idCardBarcode); + params.put("sterilizer", sterilizer); + params.put("frequency", frequency); + params.put("confirmContinue", "true"); + params.put("urgentAmount", null); + params.put("tousseWeight", ""); + String str = packingTableManager.packingTousse2(params.toString(), session); + + JSONObject json = JSONObject.fromObject(str); + assertTrue(json.optBoolean("success")); + JSONArray tousses = json.optJSONArray("tousses"); + + assertNotNull(tousses); + assertEquals(30, tousses.size()); + + JSONObject tousseObj = tousses.getJSONObject(0); + + assertEquals("Test开胸包", tousseObj.opt("tousseName")); + assertEquals("测试内科", tousseObj.opt("department")); + + JSONArray barcodes = tousseObj.optJSONArray("barcodes"); + + assertNotNull(barcodes); + assertEquals(1, barcodes.size()); + + TousseInstance tousseInstance = (TousseInstance)barcodeManager + .getBarcodeByBarcode(barcodes.getString(0)); + + + assertNotNull(tousseInstance); + + PackingRecord packingRecord = packingManager.getPackingRecordByTousseInstance(tousseInstance); + + + JSONObject tousseObj2 = tousses.getJSONObject(10); + + assertEquals("Test开胸包", tousseObj2.opt("tousseName")); + assertEquals("测试外科", tousseObj2.opt("department")); + + assertNotNull(packingRecord); + + assertEquals("cssduser1", packingRecord.getPacker()); + assertEquals("Test开胸包", packingRecord.getTousseName()); + assertEquals("器械包", packingRecord.getTousseType()); + + assertEquals(30, packingRecord.getAmount().intValue()); + + assertEquals("治包1组", packingRecord.getTaskGroup()); +// assertEquals("是", packingRecord.getIsTraceable()); + + assertEquals("1号灭菌炉", packingRecord.getSterilizer()); + assertEquals("3", packingRecord.getFrequency()); + + assertTrue(tousseObj.optBoolean("isPrint")); + assertFalse(tousseObj.optBoolean("isDisinfection")); + assertFalse(tousseObj.optBoolean("printExpirationDate")); + + List tousseInstances = packingRecord.getTousseInstanceList(objectDao); + + assertNotNull(tousseInstances); + assertEquals(30, tousseInstances.size()); + + assertEquals("Test开胸包", tousseInstances.get(20).getTousseName()); + assertEquals("棉布", tousseInstances.get(20).getPackageType()); + + packingTask1 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1); + assertNull(packingTask1); // 装配任务完成后被删除 + + packingTask2 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000117", td.getId(), 1); + assertNull(packingTask2); // 装配任务完成后被删除 + + } + + public boolean isAllThreadsTerminated(Thread[] threads){ + boolean isTerminated = true; + if (threads != null && threads.length > 0){ + for (Thread thread : threads){ + State state = thread.getState(); + if (state != Thread.State.TERMINATED){ + isTerminated = false; + break; + } + } + } + return isTerminated; + } + + @Test + public void testIsMarkTousse() { + String sterilizationDateStr = "2015-01-01"; + String validDate1 = "2015-01-08"; + try { + Date sterilizationDate = new SimpleDateFormat("yyyy-MM-dd") + .parse(sterilizationDateStr); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(sterilizationDate); + calendar.add(Calendar.MONTH, 6); + Date after6MonthsDate = calendar.getTime(); + + calendar.setTime(sterilizationDate); + calendar.add(Calendar.DATE, 180); + + Date after180daysDate = calendar.getTime(); + + SimpleDateFormat df=new SimpleDateFormat("yyyy-MM-dd"); + String after6MonthsDateStr = df.format(after6MonthsDate); + + String after180daysDateStr = df.format(after180daysDate); + + assertTrue(packingTableManager.isMarkTousse(sterilizationDateStr, + after6MonthsDateStr)); + + assertTrue(packingTableManager.isMarkTousse(sterilizationDateStr, + after180daysDateStr)); + + assertFalse(packingTableManager.isMarkTousse( + sterilizationDateStr, validDate1)); + + } catch (Exception e) { + e.printStackTrace(); + } + } +} Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/reports/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/disinfectgoods/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/disinfectgoods/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/disinfectgoods/AllTests.xml (revision 16829) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/webservice/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/webservice/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/webservice/AllTests.xml (revision 16829) @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/prepare/testForBaseDataEquivalence.json =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/prepare/testForBaseDataEquivalence.json (revision 0) +++ ssts-web/src/test/resources/test/forgon/prepare/testForBaseDataEquivalence.json (revision 16829) @@ -0,0 +1,80 @@ +{ + CleanMethodTestCases: [ + { + caseName: "caseCleanMethodA", + caseDescription : "两个实体的GUID不等，名称不等", + expected: false, + cleanMethodA: {guid : "guid1", cleanMethod : "c1"}, + cleanMethodB: {guid : "guid2", cleanMethod : "c2"} + },{ + caseName: "caseCleanMethodB", + caseDescription : "两个实体的GUID相等，名称不等", + expected: true, + cleanMethodA: {guid : "guid1", cleanMethod : "c1"}, + cleanMethodB: {guid : "guid1", cleanMethod : "c2"} + },{ + caseName: "caseCleanMethodC", + caseDescription : "两个实体的GUID不等，名称相等", + expected: true, + cleanMethodA: {guid : "guid1", cleanMethod : "c1"}, + cleanMethodB: {guid : "guid2", cleanMethod : "c1"} + },{ + caseName: "caseCleanMethodD", + caseDescription : "两个实体的GUID相等，名称相等", + expected: true, + cleanMethodA: {guid : "guid1", cleanMethod : "c1"}, + cleanMethodB: {guid : "guid1", cleanMethod : "c1"} + } + ], + DiposableGoodsTestCases: [ + { + caseName: "caseDiposableGoodsA", + caseDescription : "两个实体的GUID不等，名称不等，规格不等", + expected: false, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid2", name : "name2", specification : "s2"} + },{ + caseName: "caseDiposableGoodsB", + caseDescription : "两个实体的GUID不等，名称不等，规格相等", + expected: false, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid2", name : "name2", specification : "s1"} + },{ + caseName: "caseDiposableGoodsC", + caseDescription : "两个实体的GUID不等，名称相等，规格不等", + expected: false, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid2", name : "name1", specification : null} + },{ + caseName: "caseDiposableGoodsD", + caseDescription : "两个实体的GUID不等，名称相等，规格相等", + expected: true, + diposableGoodsA: {guid : "guid1", name : "name1", specification : null}, + diposableGoodsB: {guid : "guid2", name : "name1", specification : null} + },{ + caseName: "caseDiposableGoodsE", + caseDescription : "两个实体的GUID相等，名称不等，规格不等", + expected: true, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid1", name : "name2", specification : "s2"} + },{ + caseName: "caseDiposableGoodsF", + caseDescription : "两个实体的GUID相等，名称不等，规格相等", + expected: true, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid1", name : "name2", specification : "s1"} + },{ + caseName: "caseDiposableGoodsG", + caseDescription : "两个实体的GUID相等，名称相等，规格不等", + expected: true, + diposableGoodsA: {guid : "guid1", name : "name1", specification : "s1"}, + diposableGoodsB: {guid : "guid1", name : "name1", specification : null} + },{ + caseName: "caseDiposableGoodsG", + caseDescription : "两个实体的GUID相等，名称相等，规格相等", + expected: true, + diposableGoodsA: {guid : "guid1", name : "name1", specification : null}, + diposableGoodsB: {guid : "guid1", name : "name1", specification : null} + } + ] +} \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/prepare/diposableGoodsDefinition.json =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/prepare/diposableGoodsDefinition.json (revision 0) +++ ssts-web/src/test/resources/test/forgon/prepare/diposableGoodsDefinition.json (revision 16829) @@ -0,0 +1,50 @@ +[{ + type: '一次性物品', + name: 'test10ml注射器[小号]', + amount: 1100, + referencePrice: 1.2, + batches: [ + { + batchNum: 1402180001, + barcode: '201410150001', + storage: 700, + cost: 1.2, + expDate: '2015-09-20 00:00:00', + identifications: [ + { + identifyCode: '00001', + amount: 700, + price: 1.2 + } + ] + }, + { + batchNum: 1402180002, + barcode: '201410150002', + storage: 400, + cost: 1.2, + expDate: '2015-09-20 00:00:00', + identifications: [ + { + identifyCode: '00002', + amount: 400, + price: 1.2 + } + ] + }, + { + batchNum: 1402180003, + barcode: '201410150003', + storage: 0, + cost: 1.2, + expDate: '2015-09-20 00:00:00', + identifications: [ + { + identifyCode: '00003', + amount: 0, + price: 1.2 + } + ] + } + ] +}] \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/importbasedata/AllTests.xml (revision 16829) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/packing/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/application/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/tools/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/secondsupplyroom/service/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/reports/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/reports/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/reports/AllTests.xml (revision 16829) @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/webservice/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/application/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/application/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/application/AllTests.xml (revision 16829) @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/common/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/secondsupplyroom/service/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/secondsupplyroom/service/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/secondsupplyroom/service/AllTests.xml (revision 16829) @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/AllTests.xml (revision 16829) @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/printRecyclingApplicationConfig/AllTests.xml (revision 16829) @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/packing/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/packing/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/packing/AllTests.xml (revision 16829) @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/tools/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/tools/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/tools/AllTests.xml (revision 16829) @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/serialNumber/service/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/serialNumber/service/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/serialNumber/service/AllTests.xml (revision 16829) @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/basedatamanager/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/basedatamanager/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/basedatamanager/AllTests.xml (revision 16829) @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/invoicemanager/service/AllTests.xml (revision 16829) @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 16829 refers to a dead (removed) revision in file `ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/recyclingrecord/AllTests.xml (revision 16829) @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file