Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

DSWeb/Areas/CommMng/Controllers/PublicInterfaceController.cs

@@ -206,6 +206,61 @@ namespace DSWeb.Areas.CommMng.Controllers
             }
         }
 
+        public void PublicInterface()
+        {
+
+            var sr = new StreamReader(Request.InputStream, Encoding.UTF8);
+            var strJson = sr.ReadToEnd();
+            //BasicDataRefDAL.SaveLog(strJson, "", "大简云比对", "删除业务");
+            var param = JsonConvert.Deserialize<DJYBILLDELETE_SEND>(strJson);
+            try
+            {
+                //param.Save();
+                InterfaceLog.Save("PublicInterface", strJson);
+
+                Assembly assembly = Assembly.Load("DSWeb");
+                var classname = "DSWeb.Areas.CommMng.PublicInterfaceDAL.DJYBILLDELETE";
+                var type = assembly.GetType(classname);
+
+                Object obj = type.Assembly.CreateInstance(type.ToString());
+
+                var doset = type.GetMethod("DoSet");
+                var _param = new object[] { param };
+                DJYBILLDELETE_REPLY result = (DJYBILLDELETE_REPLY)doset.Invoke(obj, BindingFlags.Instance | BindingFlags.NonPublic, null, _param, null);
+
+                //var str = JsonConvert.Serialize(result);
+
+                string json = JsonConvert.Serialize(result);
+                //Response.Clear();
+                Response.AddHeader("Content-type", "text/json");
+                Response.AddHeader("Content-type", "application/json");
+                Response.ContentType = "application/json";
+                Response.Write(json);
+
+            }
+            catch (Exception e)
+            {
+                var _r = new DJYINFOBASE();
+                _r.Code = 1;
+
+                var msg = e.Message;
+                if (e.InnerException != null && e.InnerException.Message != null)
+                {
+                    msg += "//InnerException.Message:" + e.InnerException.Message;
+                }
+                var _rs = BasicDataRefDAL.SaveLog(msg, "", "大简云比对", "删除业务");
+                //var _rr = JsonConvert.Deserialize<DBResult>(_rs.Content);
+                _r.Message = msg;
+
+                string json = JsonConvert.Serialize(_r);
+                //Response.Clear();
+                Response.AddHeader("Content-type", "text/json");
+                Response.AddHeader("Content-type", "application/json");
+                Response.ContentType = "application/json";
+                Response.Write(json);
+
+            }
+        }
     }
 
     public class InterfaceResult { 

DSWeb/Areas/CommMng/DAL/PubSysDAL.cs

@@ -1244,7 +1244,7 @@ namespace DSWeb.Areas.CommMng.DAL
 
                         var ctnbsno = BSNO;
 
-                        if (BSNO != "*" && !CurrCtnList.Exists(x => x.DJYCTNID == ctn.id))
+                        if (BSNO != "*" && CurrCtnList.Exists(x => x.DJYCTNID == ctn.id))
                         {
                             ctnbsno = BSNO;
                             var updctn = CurrCtnList.FirstOrDefault(x => x.DJYCTNID == ctn.id);

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs

@@ -64,14 +64,10 @@ using sun.swing;
 using DSWeb.MvcShipping.Models.MsSysThirdPartyAccount;
 using Microsoft.Practices.EnterpriseLibrary.Data;
 using ICSharpCode.SharpZipLib.Zip;
-<<<<<<< HEAD
 using DSWeb.SoftMng.Filter;
-=======
 using DSWeb.Areas.MvcShipping.Models.Message.VGM;
 using DSWeb.MvcShipping.DAL.MsSysThirdPartyAccount;
->>>>>>> 559d9f9c4994ad9bd5160e9291e8a0f558c6c1b1
 
-//using Discuz.Common;
 
 namespace DSWeb.MvcShipping.Controllers
 {

DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js

@@ -110,7 +110,7 @@ Zi.LAN.DOC = "单证";
 Zi.LAN.DocEdit = "单据管理";
 Zi.LAN.DOORADDR = "到门地址";
 Zi.LAN.DPAGE = "危险品页号";
-Zi.LAN.FEE = "费用";
+Zi.LAN.FEETITLE = "费用";
 Zi.LAN.DRFEESTATUS = "应收费用";
 Zi.LAN.DRINVSTATUS = "应收开票";
 Zi.LAN.DSManifest = "直发舱单";

DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLEdit.js

@@ -1673,21 +1673,21 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, {
         }
         //var FILETYPE = "订舱附件";
         //枚举维护表tSysEnumValue_附件类型97048 //需求编号：SR2017081100003
-        this.storeFileType = Ext.create('DsExt.ux.RefTableStore', {
+        //this.storeFileType = Ext.create('DsExt.ux.RefTableStore', {
-            model: 'DsShipping.ux.TSysEnumValueDataModel',
+        //    model: 'DsShipping.ux.TSysEnumValueDataModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetTSysEnumValueList' }
+        //    proxy: { url: '/CommMng/BasicDataRef/GetTSysEnumValueList' }
-        });
+        //});
-        this.storeFileType.load({ params: { condition: " and EnumTypeID=97048" } });
+        //this.storeFileType.load({ params: { condition: " and EnumTypeID=97048" } });
-        var comboxFileType = Ext.create('DsExt.ux.RefTableCombox', {
+        //var comboxFileType = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '附件类型',
+        //    fieldLabel: '附件类型',
-            hidden:true,
+        //    hidden:true,
-            store: this.storeFileType,
+        //    store: this.storeFileType,
-            forceSelection: true,
+        //    forceSelection: true,
-            id: 'FILETYPE',
+        //    id: 'FILETYPE',
-            name: 'FILETYPE',
+        //    name: 'FILETYPE',
-            valueField: 'EnumValueName',
+        //    valueField: 'EnumValueName',
-            displayField: 'EnumValueName'
+        //    displayField: 'EnumValueName'
-        });
+        //});
 
         _this = this;
         var imgform = new Ext.FormPanel({
@@ -1708,7 +1708,13 @@ Ext.extend(Shipping.OP_SERVICEBILLEdit, Ext.Panel, {
                 allowBlank: false,
                 buttonCfg: { iconCls: 'uploaddialog' },
                 anchor: '98%'
-            }, comboxFileType
+            }, {
+                    xtype: 'textfield', 
+                    id: 'FILETYPEField',
+                    name: 'FILETYPE',
+                    fieldLabel: '随附单证代码',
+                    values:'原始单据'
+                }
 
                 , {
                 xtype: 'textfield', hidden: true,

DSWeb/Areas/MvcShipping/Viewsjs/OP_SERVICEBILL/OP_SERVICEBILLIndex.js

@@ -182,7 +182,7 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'FEE_1',
-                header: Zi.LAN.FEE,
+                header: Zi.LAN.FEETITLE,
                 width: 80
             },
             {
@@ -830,15 +830,19 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, {
                         this.onDeleteClick(button, event);
                     },
                     scope: this
-                }, {
+                }
-                    text: "打印", id: "print",
+
-                    tooltip: 'print',
+                //, {
-                    handler: function (button, event) {
+                //    text: "打印", id: "print",
-                        //this.PushState("30011");
+                //    tooltip: 'print',
-                        this.Print();
+                //    handler: function (button, event) {
-                    },
+                //        //this.PushState("30011");
-                    scope: this
+                //        this.Print();
-                }, {
+                //    },
+                //    scope: this
+                //}
+
+                , {
                     xtype: 'button',
                     text: "高级查询",
                     iconCls: "btnmore",
@@ -917,6 +921,11 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, {
             Ext.apply(store.proxy.extraParams, { condition: this.sqlcontext, sort: sortstr });
         }, this);
 
+        this.gridList.addListener('sortchange', function (ct, column, direction, eOpts) {
+            this.sortfield = column.dataIndex;
+            this.sortdire = direction;
+        }, this);
+
         //#endregion
         this.LoadInitData();
 
@@ -1223,9 +1232,9 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, {
 
     //}, //onDeleteClick
 
-    onExportClick: function (button, event) {
+    //onExportClick: function (button, event) {
-        GridExportExcelPage(this.gridList);
+    //    GridExportExcelPage(this.gridList);
-    },
+    //},
     //#region 打印
     
     Print: function () {
@@ -1341,6 +1350,55 @@ Ext.extend(Shipping.OP_SERVICEBILLIndex, Ext.Panel, {
     {
         this.onRefreshClick();
     }
+
+    , onExportClick: function (button, event) {
+        if (this.storeBodyList.getCount() == 0) {
+            return;
+        }
+        var sortstr = '';
+
+        if (this.sortfield != '' && this.sortdire != '') {
+
+            sortstr = this.sortfield + ' ' + this.sortdire;
+        }
+
+        var sql = this.getCondition();
+
+        Ext.Msg.wait('正在组织数据, 请稍侯..');
+        Ext.Ajax.request({
+            waitMsg: '正在组织数据...',
+            url: '/MvcShipping/OP_SERVICEBILL/GetDataListStr',
+            scope: this,
+            params: {
+                condition: sql,
+                sort: sortstr
+            },
+            callback: function (options, success, response) {
+                if (success) {
+                    Ext.MessageBox.hide();
+                    var jsonresult = Ext.JSON.decode(response.responseText);
+                    if (jsonresult.Success) {
+                        var returnstr = jsonresult.Data;
+                        var sql1 = returnstr;
+                        sql1 = sql1.replace(/\+/g, "@@@")
+                        if (sql1 != '') {
+                            GridExportBySql(sql1, _this.formname + 'bill', '委托结算服务.xls');
+
+                        }
+
+                    } else {
+                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                    }
+                } else {
+                    Ext.Msg.show({
+                        title: '请重试',
+                        msg: '服务器响应出错',
+                        icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                    });
+                }
+            }
+        });
+    },
 });