出库费用入账，参数略作修改；出库管理，store载入简化

DSWeb/Areas/MvcShipping/DAL/WMSOUT_GuiGe/WMSOUT_GuiGeDAL.cs

@@ -1993,7 +1993,7 @@ namespace DSWeb.MvcShipping.DAL.WMSOUT_GuiGeDAL
             Database db = DatabaseFactory.CreateDatabase();
 
             gids = "'" + gids.Trim().Replace(",", "','") + "'";
-
+            gids.Replace("''", "'");
             #region 费用入账
 
             using (SqlTransaction sqlTran = SqlHelper.BeginTransaction(SqlHelper.ConnectionStringLocalTransaction))

DSWeb/Areas/MvcShipping/Viewsjs/WMSOUT_GuiGe/WMSOUT_GuiGeEdit.js

@@ -69,7 +69,7 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
     Goodsrecords:null,
 
     initUIComponents: function () {
-
+        _this = this;
         this.formname = "formWMSOUT_GuiGeEdit"; //出库单
         this.pcnostr = "";
         this.cntrstr = "";
@@ -102,6 +102,33 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
         });
 
         //#region 页面加载
+
+        //委托单位
+        this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
+        });
+        //转移对象，需求编号：SR2017073000001
+        this.storeCLIENTNAMEOLD = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
+        });
+        //应收仓储客户，需求编号：SR2017073000001
+        this.storeARCLIENTWMSOUT = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
+        });
+        //应收出库客户，需求编号：SR2017073000001
+        this.storeARCLIENT = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
+        });
+        //应付客户，需求编号：SR2017073000001
+        this.storeTRUCKNAME = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
+        });
+
         this.opStatus = 'add';
         parentWin = window.parent.opener;
         if (parentWin) {
@@ -138,9 +165,33 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
             if (this.OPLBNAME == "WMSMAIN") {
                 //如果是出库管理处双击打开
                 this.mainWin = getMainForm(parentWin);
+                var _storecustcode = ret[9];
+                this.storeCustCode.loadData(_storecustcode.data.items);
+                this.storeCLIENTNAMEOLD.loadData(_storecustcode.data.items);
+                this.storeARCLIENTWMSOUT.loadData(_storecustcode.data.items);
+                this.storeARCLIENT.loadData(_storecustcode.data.items);
+                this.storeTRUCKNAME.loadData(_storecustcode.data.items);
+
             } else {
                 //如果是海运进口处双击打开
                 this.mainWin = getMainForm_Opener(parentWin);
+
+                this.storeTRUCKNAME.load(
+                    {
+                    callback: function (options, success, response) {
+                        if (success) {
+                            var _storecustcode = _this.storeTRUCKNAME;
+                            this.storeCustCode.loadData(_storecustcode.data.items);
+                            this.storeCLIENTNAMEOLD.loadData(_storecustcode.data.items);
+                            this.storeARCLIENTWMSOUT.loadData(_storecustcode.data.items);
+                            this.storeARCLIENT.loadData(_storecustcode.data.items);
+                        }
+                        else {
+
+                        }
+                    }
+                }
+                );
             }
         }
         //#endregion
@@ -167,18 +218,12 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
         });
         //endregion
 
-        
-
 
         //#region formSearch 下拉框信息加载
 
-        //委托单位
+
-        this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
-            model: 'DsShipping.ux.CustomRefModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
-        });
 //        this.storeCustCode.loadData(this.mainWin.GetPubStore("INFOCLIENT_ALL").data.items);
-        this.storeCustCode.load();
+        //this.storeCustCode.load();
         this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '客户名称', //需求编号：SR2017071300002-2
             store: this.storeCustCode,
@@ -196,12 +241,8 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
             }
         });
 
-        //转移对象，需求编号：SR2017073000001
+
-        this.storeCLIENTNAMEOLD = Ext.create('DsExt.ux.RefTableStore', {
+        //this.storeCLIENTNAMEOLD.load();
-            model: 'DsShipping.ux.CustomRefModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
-        });
-        this.storeCLIENTNAMEOLD.load();
         //this.storeCLIENTNAMEOLD.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items);
         this.comboxCLIENTNAMEOLD = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '转移对象',
@@ -213,12 +254,8 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
             displayField: 'CodeAndName'
         });
 
-        //应收仓储客户，需求编号：SR2017073000001
+
-        this.storeARCLIENTWMSOUT = Ext.create('DsExt.ux.RefTableStore', {
+        //this.storeARCLIENTWMSOUT.load();
-            model: 'DsShipping.ux.CustomRefModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
-        });
-        this.storeARCLIENTWMSOUT.load();
         //this.storeARCLIENTWMSOUT.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items);
         this.comboxARCLIENTWMSOUT = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '应收仓储客户',
@@ -229,12 +266,7 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
             displayField: 'CodeAndName'
         });
 
-        //应收出库客户，需求编号：SR2017073000001
+        //this.storeARCLIENT.load();
-        this.storeARCLIENT = Ext.create('DsExt.ux.RefTableStore', {
-            model: 'DsShipping.ux.CustomRefModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
-        });
-        this.storeARCLIENT.load();
         //this.storeARCLIENT.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items);
         this.comboxARCLIENT = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '应收出库客户',
@@ -246,12 +278,8 @@ Ext.extend(Shipping.WMSOUT_GuiGeEdit, Ext.Panel, {
             displayField: 'CodeAndName'
         });
 
-        //应付客户，需求编号：SR2017073000001
+
-        this.storeTRUCKNAME = Ext.create('DsExt.ux.RefTableStore', {
+        //this.storeTRUCKNAME.load();
-            model: 'DsShipping.ux.CustomRefModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
-        });
-        this.storeTRUCKNAME.load();
         //this.storeTRUCKNAME.loadData(this.mainWin.GetPubStore("OPSEAE_CUST_ISCONTROLLER").data.items);
         this.comboxTRUCKNAME = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '应付客户',

DSWeb/Areas/MvcShipping/Viewsjs/WMSOUT_GuiGe/WMSOUT_GuiGeIndex.js

@@ -15,7 +15,8 @@ Ext.extend(Shipping.WMSOUT_GuiGeIndex, Ext.Panel, {
     sqlcontext: '',
     outType: null, 
     outType2: null,  //用于虎鲸业务 判断是否查找 出区报关 的报关业务
-    bEIP : false,
+    bEIP: false,
+    customerloaded:false,
 
     initUIComponents: function () {
        
@@ -44,7 +45,18 @@ Ext.extend(Shipping.WMSOUT_GuiGeIndex, Ext.Panel, {
             model: 'DsShipping.ux.CustomRefModel',
             proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
         });
-        this.storeCustCode.load();
+        this.storeCustCode.load(
+            {
+                callback: function (options, success, response) {
+                    if (success) {
+                        _this.customerloaded = true;
+                    }
+                    else {
+                        
+                    }
+                }
+            }
+        );
         this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '客户名称',
             store: this.storeCustCode,
@@ -1380,6 +1392,7 @@ OprationSwap: function () {
     ret[6] = this.OPLBNAME;
     ret[7] = this.EditRecord;
     ret[8] = this.outType2;
+    ret[9] = this.storeCustCode;
     return ret;
     },
 onPrintClick: function (button, event) {
@@ -1473,7 +1486,7 @@ onSendXMLClick: function () {
     }
     var wmsnos = '';
     for (var i = 0; i < selectedRecords.length; i++) {
-        wmsnos += "'" + selectedRecords[i].data.BSNO + "',";
+        wmsnos += "'" + selectedRecords[i].data.BSNO + "',";3
     }
     if (wmsnos.length <= 0) {
         Ext.Msg.show({ title: '提示', msg: '请选择出库数据', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });