Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r13528 -r14293
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 13528)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 14293)
@@ -334,6 +334,8 @@
 				e.printStackTrace();
 				returnMsg.put("errMsg", e.getMessage());
 			}
+		}else{
+			returnMsg.put("errMsg", "条码不能为空!");
 		}
 		try {
 			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r13677 -r14293
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 13677)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 14293)
@@ -347,7 +347,9 @@
 }
 function loadReturnDiposableGoodsItem() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
+	top.Ext.getCmp("barcode").setValue('');// 清除条码
 	var depart = getCurrentDepart();
+	
 	//alert(depart)
 	if(depart == ''){
 		showResult("必须先填写部门!");
@@ -366,7 +368,7 @@
 	loadDiposableGoodsByBarcode = true;
 	top.Ext.getCmp("depart").disable();// 禁止修改科室
 	// 清除已加载的信息
-	top.Ext.getCmp("barcode").setValue('');// 清除条码
+	
 	top.Ext.getCmp("package1").setValue('');// 清除物品名字
 	clearBatchNumberAndPrice();// 清除批次和价格
 	haveScannedDiposableGoods = true;