Index: ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json
===================================================================
diff -u -r17049 -r17051
--- ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json	(.../testForInvoicePlanStatus.json)	(revision 17049)
+++ ssts-web/src/test/resources/test/forgon/prepare/testForInvoicePlanStatus.json	(.../testForInvoicePlanStatus.json)	(revision 17051)
@@ -231,9 +231,9 @@
 			
             caseName: "caseDeliverStatusA",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusB",
@@ -289,18 +289,18 @@
 		,{
             caseName: "caseDeliverStatusAA",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusAB",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: true , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusAC",
@@ -313,10 +313,10 @@
         },{
             caseName: "caseDeliverStatusAD",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 2, recyclingAmount: 2, sendOutAmount: 0, isTerminated: true , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusAE",
@@ -329,26 +329,26 @@
         },{
             caseName: "caseDeliverStatusAF",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 2, recyclingAmount: 2, sendOutAmount: 1, isTerminated: true , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusAG",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "已发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: false , isInvoice:"否"}
             ]
         },{
             caseName: "caseDeliverStatusAH",
             InvoicePlan: { type : "通用申请单"},
-			expectedDeliverStatus: "待发货",
+			expectedDeliverStatus: null,
             TousseItems: [
-                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false},
-                { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true}
+                { amount: 0, recyclingAmount: 0, sendOutAmount: 0, isTerminated: false , isInvoice:"否"},
+                { amount: 2, recyclingAmount: 2, sendOutAmount: 2, isTerminated: true , isInvoice:"否"}
             ]
         }
 		,{
@@ -663,11 +663,11 @@
             ]
         },{
             caseName: "caseReturnStatusAG",
-			expectedReturnStatus: "已归还",
+			expectedReturnStatus: "部分归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
+                { amount : 1,sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: false},
+                { amount : 2,sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
             ]
         },{
             caseName: "caseReturnStatusAH",
@@ -722,8 +722,8 @@
 			expectedReturnStatus: "已归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
+                { amount: 2, sendOutAmount: 0, alreadySignedAmount: 0, isTerminated: true},
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
             ]
         },{
             caseName: "caseReturnStatusBH",
@@ -810,8 +810,8 @@
 			expectedReturnStatus: "已归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 0, isTerminated: true},
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
             ]
         },{
             caseName: "caseReturnStatusDH",
@@ -866,8 +866,8 @@
 			expectedReturnStatus: "已归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 1, isTerminated: true},
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
             ]
         },{
             caseName: "caseReturnStatusFH",
@@ -882,16 +882,16 @@
 			expectedReturnStatus: "已归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false},
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false}
             ]
         },{
             caseName: "caseReturnStatusGH",
 			expectedReturnStatus: "已归还",
 			InvoicePlan: {type: "借物单"},
             TousseItems: [
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false},
-                { sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true}
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: false},
+                { amount: 2, sendOutAmount: 2, alreadySignedAmount: 2, isTerminated: true}
             ]
         },{
             caseName: "caseReturnStatusHH",