diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
index a6310047..14648dd4 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
@@ -39344,7 +39344,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
 
                 if (bill.CARGOID == "D")
                 {
-                    var tempset = bill.TEMPSET.Replace("+", "");
+                    var tempset = "";
+                    var flashtmp = "";
+                    tempset = bill.TEMPSET.Replace("+", "");
                     if (tempset != "")
                     {
                         var fuhao = "";
@@ -39361,14 +39363,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                             }
                         }
                         tempset = fuhao + tempset;
+                        if (bill.TEMPID == "C") flashtmp = "CEL";
+                        if (bill.TEMPID == "F") flashtmp = "FAH";
                     }
                     else
                     {
-                        tempset = "000";
+                        tempset = "";
                     }
-                    var flashtmp = "";
-                    if (bill.TEMPID == "C") flashtmp = "CEL";
-                    if (bill.TEMPID == "F") flashtmp = "FAH";
+             
+  
 
                     r.WriteLine("DGS+IMD+" + bill.DCLASS + ":" + bill.DPAGE + "+" + bill.DUNNO + "+" + tempset + ":" + flashtmp + "+" + bill.TEMPMAX + "'");
                     icount = icount + 1;
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js
index 2144674d..c0c3416c 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsInfoClient/MsInfoClientRang.js
@@ -48,7 +48,22 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
 
         //#region List列表显示信息
 
-
+        this.Pagenum = Ext.create('Ext.form.field.Number', {
+            name: 'bottles',
+            fieldLabel: Zi.LAN.PageSize,
+            labelAlign: 'right',
+            value: this.PageSize,
+            maxValue: 100000,
+            width: 180,
+            minValue: 0,
+            listeners: {
+                specialkey: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+        });
 
         Ext.grid.RowNumberer = Ext.extend(Ext.grid.RowNumberer, {
             width: 30
@@ -222,12 +237,12 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
             },
             columns: this.girdcolums,
             // paging bar on the bottom
-            bbar: Ext.create('Ext.PagingToolbar', {
+            bbar: [Ext.create('Ext.PagingToolbar', {
                 store: this.storeList,
                 displayMsg: Zi.LAN.displayMsg, //'当前显示 {0} - {1}条记录 /共 {2}条记录',
                 emptyMsg: Zi.LAN.emptyMsg, //"没有数据"
                 displayInfo: true
-            })
+            }), this.Pagenum]
         });
 
         /////////////以下部分为获取存储的gridpanel显示样式
@@ -726,6 +741,8 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
     onRefreshClick: function (button, event) {
         //var girdcolums = this.gridList.getColumnMode();
         var sql = this.getCondition();
+        this.PageSize = this.Pagenum.getValue();
+        this.storeList.currentPage = 1;
         this.sqlcontext = sql;
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, sort: '', condition: sql },
@@ -738,6 +755,8 @@ Ext.extend(Shipping.MsInfoClientRang, Ext.Panel, {
     onDsQuery: function () {
         //var girdcolums = this.gridList.getColumnMode();
         var sql = this.sqlcontext;
+        this.PageSize = this.Pagenum.getValue();
+        this.storeList.currentPage = 1;
         this.storeList.load({
             params: { start: 0, limit: this.PageSize, sort: '', condition: sql },
             waitMsg: Zi.LAN.ZhengZaiChaXunShuJu,
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
index bf8f9c7a..95ee75d3 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
@@ -2699,8 +2699,11 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         var mblNo = form.findField('PS_MBLNO').getValue();
         sql = sql + getAndConSql(sql, mblNo, " (MblNo  like '%" + mblNo + "%' or MBLNOse like '%" + mblNo + "%') ");
 
+        var TruckNo = form.findField('TruckNo').getValue();
+        sql = sql + getAndConSql(sql, TruckNo, " (TruckNo  like '%" + TruckNo + "%' or WmsTruckNo like '%" + TruckNo + "%' or FrTruckNo like '%" + TruckNo + "%') ");
+
         var drvName = form.findField('PS_DRVNAME').getValue();
-        sql = sql + getAndConSql(sql, drvName, " (DrvName like '%" + drvName + "%' or DrvCode ='" + drvName + "') ");
+        sql = sql + getAndConSql(sql, drvName, " (DrvName like '%" + drvName + "%' or DrvCode ='" + drvName + "' or WmsDrvName ='" + drvName + "' or FrDrvName ='" + drvName + "') ");
 
         var DstArea = form.findField('FactoryAddrSe').getValue();
         sql = sql + getAndConSql(sql, DstArea, "  (FactoryAddrSe like '%" + DstArea + "%' ) ");
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
index 014b08b5..4a352f6b 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
@@ -2706,11 +2706,16 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         sql = Ext.JSON.encode(sqldata);
         */
 
+
+        var TruckNo = form.findField('TruckNo').getValue();
+        sql = sql + getAndConSql(sql, TruckNo, " (TruckNo  like '%" + TruckNo + "%' or WmsTruckNo like '%" + TruckNo + "%' or FrTruckNo like '%" + TruckNo + "%') ");
+
         var mblNo = form.findField('PS_MBLNO').getValue();
         sql = sql + getAndConSql(sql, mblNo, " (MblNo  like '%" + mblNo + "%' or MBLNOse like '%" + mblNo + "%') ");
 
         var drvName = form.findField('PS_DRVNAME').getValue();
-        sql = sql + getAndConSql(sql, drvName, " (DrvName like '%" + drvName + "%' or DrvCode ='" + drvName + "') ");
+        sql = sql + getAndConSql(sql, drvName, " (DrvName like '%" + drvName + "%' or DrvCode ='" + drvName + "' or WmsDrvName ='" + drvName + "' or FrDrvName ='" + drvName + "') ");
+
 
         var DstArea = form.findField('FactoryAddrSe').getValue();
         sql = sql + getAndConSql(sql, DstArea, "  (FactoryAddrSe like '%" + DstArea + "%' ) ");