Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java
===================================================================
diff -u -r34353 -r34375
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java	(.../StorageRecordManagerImpl.java)	(revision 34353)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/StorageRecordManagerImpl.java	(.../StorageRecordManagerImpl.java)	(revision 34375)
@@ -5,8 +5,10 @@
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -280,6 +282,9 @@
 			//如接收到响应成功的代码，则断开连接
 			isCommandSuccess(ret);
 			logger.info("卡迪斯货柜成功" + status + "物品！");
+		} catch (SocketTimeoutException e) {
+			errorMessage = "命令发送成功，等待服务器响应！";
+			logger.info(errorMessage);
 		} catch (Exception e) {
 			errorMessage = e.getMessage();
 			logger.info(errorMessage);
@@ -350,6 +355,17 @@
 	 * @return
 	 */
 	private String buildKardexContainerTCPCommand(StorageLocation storageLocation, String addr, String status) {
+		
+		if(StringUtils.isBlank(storageLocation.getStorageLocationCode())){
+			throw new SystemException("库位编码不能为空！");
+		}
+		
+		Pattern pattern = Pattern.compile("[0-9]*");
+		if(pattern.matcher(storageLocation.getStorageLocationCode()).matches()
+				&& Long.valueOf(storageLocation.getStorageLocationCode()) == 0){
+			throw new SystemException("库位编码不能为" + storageLocation.getStorageLocationCode() + "！");
+		}
+		
 		String commond = "|1|" + addr + "|" + storageLocation.getStorageLocationCode();
 		if(StorageRecord.OUT.equals(status)){
 			commond = "4" + commond;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java
===================================================================
diff -u -r34353 -r34375
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java	(.../StorageRecordAction.java)	(revision 34353)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/action/StorageRecordAction.java	(.../StorageRecordAction.java)	(revision 34375)
@@ -90,7 +90,7 @@
 			}
 			jsonObj = JSONUtil.buildJsonObject(true, "物品" + status + "成功！");
 		} catch (Exception e) {
-			jsonObj = JSONUtil.buildJsonObject(false, "操作失败：" + e.getMessage());
+			jsonObj = JSONUtil.buildJsonObject(false, e.getMessage());
 		}
 		StrutsResponseUtils.output(jsonObj.toString());
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
===================================================================
diff -u -r33602 -r34375
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 33602)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 34375)
@@ -136,5 +136,6 @@
   //在待灭菌物品列表显示虚拟篮筐
   showVirtualBasketInTheListOfItemsToBeSterilized:true,
   //装配时自动设置标识牌条码（前提是一个包实例只能装一个篮筐而且是整包清洗）
-  autoSetIDCardBarcodeForPacking:true
+  autoSetIDCardBarcodeForPacking:true,
+  enableWarehousePositionModuleInterfaceWithKardexContainer:true
 }
\ No newline at end of file