Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
===================================================================
diff -u -r18655 -r18768
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java	(.../WashTransitionItemManagerImpl.java)	(revision 18655)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java	(.../WashTransitionItemManagerImpl.java)	(revision 18768)
@@ -228,6 +228,11 @@
 			json.put("tousseName", washTransitionItem.getTousseName());
 			json.put("amount", washTransitionItem.getAmount());
 			json.put("washer", washTransitionItem.getWasher());
+			json.put("hasErrors", washTransitionItem.getHasErrors());
+			json.put("hasDamages", washTransitionItem.getHasDamages());
+			json.put("damagesDetail", washTransitionItem.getDamagesDetail());
+			json.put("errorsDetail", washTransitionItem.getErrorsDetail());
+			json.put("urgentLevel", washTransitionItem.getUrgentLevel());
 			formatErrorDamages(washTransitionItem.getIdCardBarcode(),washTransitionItem.getTousseInstanceId(),json);
 			return json;
 		}
@@ -311,6 +316,11 @@
 			item.setAmount(json.optInt("amount"));
 			item.setWasher(json.optString("washer"));
 //			item.setWasherCode(json.optString("washerCode"));
+			item.setHasErrors(json.optString("hasErrors"));
+			item.setHasDamages(json.optString("hasDamages"));
+			item.setDamagesDetail(json.optString("damagesDetail"));
+			item.setErrorsDetail(json.optString("errorsDetail"));
+			item.setUrgentLevel(json.optString("urgentLevel"));
 			return item;
 		}
 		return null;
Index: forgon-core/src/main/java/com/forgon/util/StringUtil.java
===================================================================
diff -u -r17182 -r18768
--- forgon-core/src/main/java/com/forgon/util/StringUtil.java	(.../StringUtil.java)	(revision 17182)
+++ forgon-core/src/main/java/com/forgon/util/StringUtil.java	(.../StringUtil.java)	(revision 18768)
@@ -13,10 +13,12 @@
 import java.util.Set;
 import java.util.UUID;
 
-import com.jfinal.kit.StrKit;
 import org.apache.commons.lang.StringUtils;
 
+import com.forgon.tools.string.StringTools;
+import com.jfinal.kit.StrKit;
 
+
 /**
  * 对字符串各种操作的工具类
  */
@@ -200,6 +202,30 @@
         }
         return tester;
     }
+    /**
+     * 合并字符串。
+     * <br/>combineString("|","a","b") -> a|b
+     * <br/>combineString("","a","b")-> a,b
+     * <br/>combineString(" ","a","b")-> a b
+     * <br/>combineString("|",null,"b","c")-> b|c
+     * <br/>combineString("|","","b","c")-> b|c
+     * <br/>combineString("|"," ","b","c")-> b|c
+     * @param split 不同字符中之间的分隔符，如果为null或者空,则用,代替。空格符不算空
+     * @param strings 需要合并的字符串,如果为null,则不在结果中
+     * @return 
+     */
+    public static String combineString(String split,String ...strings ){
+    	if(StringTools.isEmpty(split)){
+    		split = ",";
+    	}
+    	List<String> vs = new ArrayList<>();
+    	for(String str : strings){
+    		if(StringTools.isNotBlank(str)){
+    			vs.add(str);
+    		}
+    	}
+    	return String.join(split, vs);
+    }
 
 
     /**
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordForm.js
===================================================================
diff -u -r18655 -r18768
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordForm.js	(.../washTransitionRecordForm.js)	(revision 18655)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washTransitionRecord/washTransitionRecordForm.js	(.../washTransitionRecordForm.js)	(revision 18768)
@@ -74,11 +74,11 @@
 			 hasDamages = '有';
 			 damagesDetail.push(itemdata.damages);
 		 }
-		 if(!isUndefinedOrNullOrEmpty(itemdata.errorRemarks)){
-			 errorsDetail.push(itemdata.errorRemarks);
+		 if(!isUndefinedOrNullOrEmpty(itemdata.errorRemark)){
+			 errorsDetail.push(itemdata.errorRemark);
 		 }
-		 if(!isUndefinedOrNullOrEmpty(itemdata.damagesRemark)){
-			 damagesDetail.push(itemdata.damagesRemark);
+		 if(!isUndefinedOrNullOrEmpty(itemdata.damageRemark)){
+			 damagesDetail.push(itemdata.damageRemark);
 		 }
 		 var goodsName = itemdata.tousseName;
 		 var idCardBarcodeOrAmount = itemdata.idCardBarcode;
@@ -110,10 +110,10 @@
 			 	hasDamages:hasDamages,
 			 	urgentLevel:itemdata.urgentLevel,
 			 	errors:itemdata.errors,
-			 	errorRemarks:itemdata.errorRemarks,
+			 	errorRemark:itemdata.errorRemark,
 			 	errorsDetail:errorsDetail.join('|'),
 			 	damages:itemdata.damages,
-			 	damagesRemark:itemdata.damagesRemark,
+			 	damageRemark:itemdata.damageRemark,
 			 	damagesDetail:damagesDetail.join('|'),
 				leaf : leaf
 			});
@@ -146,8 +146,8 @@
 		fields: [{name : 'id'},{name : 'tousseInstanceId'},{name : 'tousseDefinitionId'},
 		         {name : 'idCardBarcode'},{name : 'tousseName'},{name : 'amount'},{name : 'goodsName'},
 		         {name : 'idCardBarcodeOrAmount'},{name : 'washer'},{ name : 'washerCode'},{name : 'hasErrors'},
-		         {name : 'hasDamages'},{name : 'urgentLevel'},{name : 'errors'},{name : 'errorRemarks'},
-		         {name : 'errorsDetail'},{name : 'damagesDetail'},{name : 'damages'},{name : 'damagesRemark'},
+		         {name : 'hasDamages'},{name : 'urgentLevel'},{name : 'errors'},{name : 'errorRemark'},
+		         {name : 'errorsDetail'},{name : 'damagesDetail'},{name : 'damages'},{name : 'damageRemark'},
 		         {name : 'materialInstanceId'},{name : 'materialName'},{name : 'specification'}]
 	});
 	
@@ -161,6 +161,9 @@
         },
         listeners: {
         	load: function(_this, node, records, successful, eOpts) {
+        		if(records == null || records.length == 0){
+        			return;
+        		}
         		var firstRow = records[0];
         		if (firstRow) {
         			var firstRowData = firstRow.data;
Index: ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java
===================================================================
diff -u
--- ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java	(revision 0)
+++ ssts-web/src/test/java/test/forgon/tools/util/StringUtilTests.java	(revision 18768)
@@ -0,0 +1,20 @@
+package test.forgon.tools.util;
+
+import static org.testng.Assert.assertEquals;
+
+import org.testng.annotations.Test;
+
+import com.forgon.util.StringUtil;
+
+public class StringUtilTests {
+	@Test
+	public void testCombineString(){
+		assertEquals(StringUtil.combineString("|", "a","b"),"a|b");
+		assertEquals(StringUtil.combineString("|","a","b") ,"a|b"); 
+		assertEquals(StringUtil.combineString("","a","b"),"a,b"); 
+		assertEquals(StringUtil.combineString(" ","a","b"),"a b"); 
+		assertEquals(StringUtil.combineString("|",null,"b","c"), "b|c"); 
+		assertEquals(StringUtil.combineString("|","","b","c"),"b|c"); 
+		assertEquals(StringUtil.combineString("|"," ","b","c"),"b|c");
+	}
+}