优化系统单据代码，更新sql

erp_web/js/common/common.js

@@ -26,27 +26,29 @@
 	/**
 	 * 扩展datagrid的editors方法，支持combogrid
 	 */
-	$.extend($.fn.datagrid.defaults.editors, {
-		combogrid: {
-			init: function (container, options) {
-				var input = $('<input type="text" style="height: 22px;" class="datagrid-editable-input">').appendTo(container);
-				input.combogrid(options);
-				return input;
-			},
-			destroy: function (target) {
-				$(target).combogrid('destroy');
-			},
-			getValue: function (target) {
-				return $(target).combogrid('getValue');
-			},
-			setValue: function (target, value) {
-				$(target).combogrid('setValue', value);
-			},
-			resize: function (target, width) {
-				$(target).combogrid('resize', width);
+	if($.fn.datagrid) {
+		$.extend($.fn.datagrid.defaults.editors, {
+			combogrid: {
+				init: function (container, options) {
+					var input = $('<input type="text" style="height: 22px;" class="datagrid-editable-input">').appendTo(container);
+					input.combogrid(options);
+					return input;
+				},
+				destroy: function (target) {
+					$(target).combogrid('destroy');
+				},
+				getValue: function (target) {
+					return $(target).combogrid('getValue');
+				},
+				setValue: function (target, value) {
+					$(target).combogrid('setValue', value);
+				},
+				resize: function (target, width) {
+					$(target).combogrid('resize', width);
+				}
 			}
-		}
-	});
+		});
+	}
 
 	$(function() {
 		domresize();

erp_web/js/pages/materials/in_out.js

@@ -192,7 +192,6 @@
 					if(depot.isDefault){
 						defDepotId =  depot.id;
 					}
-					depotString = depotString + ",";
 				}
 			}
 			depotString = depotString.substring(0, depotString.length-1);