1

DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs

@@ -4191,6 +4191,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
             strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF");
             strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME");
             strSql.Append(",cm.SALECORPID,(select [NAME] from [company] where GID=cm.SALECORPID) as SALECORP");
+            strSql.Append(",(select TOP 1 [DESCRIPTION] from [info_client] where [SHORTNAME]=cm.CUSTOMERNAME) as CUSTOMERNAMEFULLNAME");
 
             var OPLISTNOCANCEL = MsSysParamSetDAL.GetData("PARAMNAME='RECVAPPMUSTAUDIT'");
             if (OPLISTNOCANCEL.PARAMVALUE == "1")
@@ -4264,6 +4265,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
                     data.SETTLETYPE = Convert.ToString(reader["SETTLETYPE"]);
                     data.SALECORP = Convert.ToString(reader["SALECORP"]);
                     data.SALECORPID = Convert.ToString(reader["SALECORPID"]);
+                    data.CUSTOMERNAMEFULLNAME = Convert.ToString(reader["CUSTOMERNAMEFULLNAME"]);
+
                     #endregion
                     headList.Add(data);
                 }

DSWeb/Areas/Account/Models/Chfee_settlement/Chfee_Paysettlement.cs

@@ -84,6 +84,8 @@ namespace DSWeb.Areas.Account.Models.Chfee_Settlement
             set { _customername = value; }
         }
 
+        public string CUSTOMERNAMEFULLNAME { get; set; }
+
         public string CURR
         {
             get { return _curr; }

DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js

@@ -349,7 +349,8 @@ Ext.define('Payapplication_do_detail', {
     idProperty: 'BILLNO',
     fields: [
                 { name: 'BILLNO', type: 'string' },
-                { name: 'CUSTOMERNAME', type: 'string' },
+        { name: 'CUSTOMERNAME', type: 'string' },
+        { name: 'CUSTOMERNAMEFULLNAME', type: 'string' },
                 { name: 'SALECORPID', type: 'string' },
                 { name: 'SALECORP', type: 'string' },
                 { name: 'BILLSTATUS', type: 'string' },

DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js

@@ -1098,7 +1098,12 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
             dataIndex: 'REMARK',
             header: Zi.LAN.Remark,
             width: 60
-        }
+            }, {
+                sortable: true,
+                dataIndex: 'CUSTOMERNAMEFULLNAME',
+                header: Zi.LAN.CustomerNameFullName,
+                width: 80
+            }
         ];
 
         this.girdfeecolums = this.initgirdfeecolums;

DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_en-us.js

@@ -348,4 +348,5 @@ Zi.LAN.PAYSTATUS = "支付状态";
 Zi.LAN.UsdPayReg = "美元快付注册";
 Zi.LAN.UsdPayRegUrl = "美元快付备案/充值";
 Zi.LAN.ISREVINV = "收到发票";
-Zi.LAN.PAYREASON = "支付失败原因";
+Zi.LAN.PAYREASON = "支付失败原因";
+Zi.LAN.CustomerNameFullName = "结算客户全称";

DSWeb/Areas/Account/Viewsjs/Chfee_settlement/Zi_zh-cn.js

@@ -354,4 +354,5 @@ Zi.LAN.PAYSTATUS = "支付状态";
 Zi.LAN.UsdPayReg = "美元快付注册";
 Zi.LAN.UsdPayRegUrl = "美元快付备案/充值";
 Zi.LAN.ISREVINV = "收到发票";
-Zi.LAN.PAYREASON = "支付失败原因";
+Zi.LAN.PAYREASON = "支付失败原因";
+Zi.LAN.CustomerNameFullName = "结算客户全称";

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs

@@ -4021,10 +4021,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                     }
                     else
                     {
-                        if (StringIsChinese(billams.SIREMARK))
+                        //if (StringIsChinese(billams.SIREMARK))
-                        {
+                        //{
-                            error = error + "<br />提单号：" + bill.MBLNO + " SI备注中含有中文或双字节字符";
+                        //    error = error + "<br />提单号：" + bill.MBLNO + " SI备注中含有中文或双字节字符";
-                        }
+                        //}
                         //if (bill.EDIREMARK.ToString().Trim()!="" && BasicDataRefDAL.isHasChinese(bill.EDIREMARK))
                         //{
                         //    error = error + "<br />提单号：" + bill.MBLNO + " 请在EDI备注中输入:英文（不允许录入中文）";
@@ -4047,10 +4047,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                     }
                     else
                     {
-                        if (StringIsChinese(bill.EDIREMARK))
+                        //if (StringIsChinese(bill.EDIREMARK))
-                        {
+                        //{
-                            error = error + "<br />提单号：" + bill.MBLNO + " EDI备注中含有中文或双字节字符";
+                        //    error = error + "<br />提单号：" + bill.MBLNO + " EDI备注中含有中文或双字节字符";
-                        }
+                        //}
                         //if (bill.EDIREMARK.ToString().Trim()!="" && BasicDataRefDAL.isHasChinese(bill.EDIREMARK))
                         //{
                         //    error = error + "<br />提单号：" + bill.MBLNO + " 请在EDI备注中输入:英文（不允许录入中文）";

DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs

@@ -2337,7 +2337,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
                 remark = remark + " 限重:" + OrderData.MAXWEIGHT;
             if (ORREMARK != "")
                 remark = remark + " 确认订舱备注:" + ORREMARK;
-            headData.OPERATORFAX = remark;//备注
+            headData.REMARK = remark;//备注
             headData.STATUS1 = OrderData.STATUS1;//状态1
             headData.STATUS2 = OrderData.STATUS2;//状态2
             headData.STATUS3 = OrderData.STATUS3;//状态3

DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js

@@ -13671,28 +13671,28 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                 printType = 'SEAEDRFEE';
             } else { printType = 'SEAECRFEE'; };
             var sql1 = "SET LANGUAGE 'us_english' "
-            + "  select * from op_seae  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
+                + "  select * from op_seae  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'op_Apply') {
             var printType = '';
             if (type == 1) {
                 printType = 'APPLYDRFEE';
             } else { printType = 'APPLYCRFEE'; };
             var sql1 = "SET LANGUAGE 'us_english' "
-            + "  select * from op_apply  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
+                + "  select * from op_apply  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'op_Seai') {
             var printType = '';
             if (type == 1) {
                 printType = 'SEAIDRFEE';
             } else { printType = 'SEAICRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
-            + */"  select * from op_seai  WHERE BsNo = '" + _thisfee.strPBSNO+ "'";
+            + */"  select * from op_seai  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'op_Bulk') {
             var printType = '';
             if (type == 1) {
                 printType = 'BULKDRFEE';
             } else { printType = 'BULKCRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
-            + */"  select * from op_bulk  WHERE BsNo = '" + _thisfee.strPBSNO+ "'";
+            + */"  select * from op_bulk  WHERE BsNo = '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'op_other') {
             var printType = '';
             if (type == 1) {
@@ -13720,14 +13720,14 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                 printType = 'AIRIDRFEE';
             } else { printType = 'AIRICRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
-            + */"  select * from op_airi WHERE BsNo = '" +_thisfee.strPBSNO+ "'";
+            + */"  select * from op_airi WHERE BsNo = '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'OpCtnBsCard') {
             var printType = '';
             if (type == 1) {
                 printType = 'CTNBSCARDDRFEE';
             } else { printType = 'CTNBSCARDCRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
-            + */"  select * from op_ctnbscard WHERE GID= '" +_thisfee.strPBSNO + "'";
+            + */"  select * from op_ctnbscard WHERE GID= '" + _thisfee.strPBSNO + "'";
         } else if (this.stroplb == 'import_main') {
             var printType = '';
             if (type == 1) {
@@ -13735,6 +13735,12 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             } else { printType = 'IMPORTTRADECRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
             + */"  select * from Import_main WHERE ContractNo= '" + _thisfee.strPBSNO + "'";
+        } else if (this.stroplb == 'tMsWlPcHead') {
+            var printType = '';
+            if (type == 1) {
+                printType = 'tMsWlPcHeadDRFEE';
+            } else { printType = 'tMsWlPcHeadCRFEE'; };
+            var sql1 ="  select * from tMsWlPcHead WHERE GID= '" + _thisfee.strPBSNO + "'";
         };
 
 
@@ -13937,6 +13943,12 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             } else { printType = 'IMPORTTRADECRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
             + */"  select * from Import_main WHERE ContractNo= '" + _thisfee.strPBSNO + "'";
+        } else if (this.stroplb == 'tMsWlPcHead') {
+            var printType = '';
+            if (type == 1) {
+                printType = 'tMsWlPcHeadDRFEE';
+            } else { printType = 'tMsWlPcHeadCRFEE'; };
+            var sql1 = "  select * from tMsWlPcHead WHERE GID= '" + _thisfee.strPBSNO + "'";
         };
 
         var custname = '';
@@ -14118,6 +14130,10 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             } else { printType = 'IMPORTTRADECRFEE'; };
             var sql1 = /*"SET LANGUAGE 'us_english' "
             + */"  select * from Import_main WHERE ContractNo= '" + _thisfee.strPBSNO + "'";
+        } else if (this.stroplb == 'tMsWlPcHead') {
+            var printType = '';
+              printType = 'tMsWlPcHeadALL';
+            var sql1 = "  select * from tMsWlPcHead WHERE GID= '" + _thisfee.strPBSNO + "'";
         };
 
 
@@ -14231,6 +14247,10 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                             printType = 'IMPORTTRADEGAIN';
                             var sql1 = /*"SET LANGUAGE 'us_english' "
                                  + */"  select * from Import_main WHERE ContractNo= '" + _thisfee.strPBSNO + "'";
+                        } else if (this.stroplb == 'tMsWlPcHead') {
+                            var printType = '';
+                            printType = 'tMsWlPcHeadGAIN';
+                            var sql1 = "  select * from tMsWlPcHead WHERE GID= '" + _thisfee.strPBSNO + "'";
                         };
 
                         var inputby='';

DSWeb/Areas/MvcShipping/Viewsjs/MsOpBill/MsFeeHistoryView.js

@@ -486,6 +486,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             region: "north",
             title: '收费申请',
+            split: true,
             height: 100,
             items: [this.gridListRecShen]
         });
@@ -603,6 +604,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             region: "north",
             title: '付费申请',
+            split: true,
             height: 100,
             items: [this.gridListPayShen]
         });
@@ -729,6 +731,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             title: '结算信息',
             region: "north",
+            split: true,
             height: 100,
             items: [this.gridListStl]
         });
@@ -867,6 +870,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             region: "north",
             title: '发票信息',
+            split: true,
             height: 100,
             items: [this.gridListInv]
         });
@@ -984,6 +988,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             region: "north",
             title: '发票申请',
+            split: true,
             height: 100,
             items: [this.gridListInvShen]
         });
@@ -1105,6 +1110,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
             layout: "border",
             title: '发票核销',
             region: "north",
+            split: true,
             height:100,
             items: [this.gridListInvStl]
         });
@@ -1177,6 +1183,7 @@ Ext.extend(Shipping.MsFeeHistoryView, Ext.Panel, {
         this.panelDui = new Ext.Panel({
             layout: "border",
             title: '对账信息',
+            split: true,
             region: "north",
             height: 100,
             items: [this.gridListDui]

DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js

@@ -867,6 +867,31 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
         });
 
 
+        this.storeVoyVeg = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.VesselModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetVesselList' }
+        });
+
+
+        this.comboxVoyVeg = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: '船 名', //'船 名',
+            store: this.storeVoyVeg,
+            name: 'VESSEL',
+            labelWidth: 30,
+            flex: 0.8,
+            valueField: 'VESSEL',
+            displayField: 'VESSEL',
+            enableKeyEvents: true,
+            listeners: {
+                keyup: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+
+        });
+
 
         //#endregion
 
@@ -953,20 +978,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
                         this.comboxCustCode
                         //, this.comboxF_CustCode
                         //, this.comboxBLSTATUS
-                        , {
+                            , this.comboxVoyVeg, {
-                            fieldLabel: '船名',
-                            name: 'VESSEL',
-                            labelWidth: 40,
-                            flex: 1.4,
-                            enableKeyEvents: true,
-                            listeners: {
-                                specialkey: function (field, e) {
-                                    if (e.getKey() == e.ENTER) {
-                                        _this.onRefreshClick();
-                                    }
-                                }
-                            }
-                        }, {
                             fieldLabel: '航次',
                             name: 'VOYNO',
                             labelWidth: 40,

DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js

@@ -7147,7 +7147,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
                 } else if (FEERANGE == '未开票未作收费申请未结算') {
                     sql = sql +' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)=0 and isnull(f.ORDERAMOUNT,0)=0)  '
                 } else if (FEERANGE == '已收费申请未结算') {
-                    sql = sql + ' (f.FEETYPE=1 AND isnull(f.ORDERAMOUNT,0)<>0 AND isnull(f.SETTLEMENT,0)=0) '
+                    sql = sql + ' and (f.FEETYPE=1 AND isnull(f.ORDERAMOUNT,0)<>0 AND isnull(f.SETTLEMENT,0)=0) '
                 }
             }
         }

DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs

@@ -1383,7 +1383,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
 
             strSql.Append(" ,g.TRUCKYFCR,g.TRUCKJDJYCR,g.TRUCKJQCR,g.TRUCKDXJQCR,g.TRUCKGSFCR,g.TRUCKXJYQCR,g.TRUCKXJGSCR,g.TRUCKXJNSCR,g.TRUCKXJTLXCR,g.TRUCKXJWXCR,g.TRUCKXJQTCR ");
             strSql.Append(",g.TRUCKLQFCR,g.TTLTRUCKCR,g.TTLTRUCKSTLCR,g.TTLTRUCKBLCCR,g.TTLYFCR,g.TTLDSFCR,g.TTLGSFCR,g.TTLQTFCR,g.TTLOTCR,g.TTLOTSTLCR,g.TTLOTBLCCR,g.TTLDR,g.TTLCR  ");
-            strSql.Append(",g.TTLDR-g.TTLCR TTLPROFIT,g.TTLOTCR-g.TTLTRUCKSTLCR TTLTRUCKPROFIT ");
+            strSql.Append(",g.TTLPROFIT,g.TTLTRUCKPROFIT ");
 
             strSql.Append(" from V_tMsWlPcHead t left join v_op_gain_sum_truck g on (g.BSNO=t.gId) ");
 

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js

@@ -4086,6 +4086,12 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         if (this.storeList.getCount() == 0) {
             return;
         }
+        var bsno = "111";
+        var selections = this.gridList.getSelectionModel().getSelection();
+        if (selections.length != 0) {
+            bsno = record.data.gId;
+        }
+
 
         Ext.Msg.wait('正在组织数据, 请稍侯..');
         Ext.Ajax.request({
@@ -4104,7 +4110,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                         var returnstr = jsonresult.data;
                         var printType = 'tMsWlPcHead';
                         var sql1 = returnstr;
-                        var sql2 = "";
+                        var sql2 = "SELECT * FROM tMsWlPcHead WHERE GID='" + bsno +"'";
                         var sql3 = "";
                         var sql4 = "";
                         var sql5 = "";