12

DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs

@@ -1553,7 +1553,9 @@ namespace DSWeb.MvcShipping.Controllers
                     单量 = 分单号list.Count();
                 }
 
-                MsChFeeDAL.MakeNewFee(USERID, item.BSNO, "青岛大简云", "其它", 2, "舱单费", amount * 单量, "单票", 单量);
+                var enter = MsOpSeaeDAL.getUserId(" SHOWNAME='自动化'","");
+
+                MsChFeeDAL.MakeNewFee(enter, item.BSNO, "青岛大简云", "其它", 2, "舱单费", amount * 单量, "单票", 单量);
 
 
             }

DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js

@@ -12780,6 +12780,33 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
 
         });
 
+        this.storeCust = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListRm' }
+        });
+
+        //        this.storeCust.load({ params: { condition: ""} });
+        this.comboxCust = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: Zi.LAN.CUSTNAME,
+            store: this.storeCust,
+            queryMode: 'remote',
+            minChars: 0,
+            queryParam: 'CODENAME',
+            forceSelection: true,
+            name: 'CUSTNAME',
+            valueField: 'CustName',
+            displayField: 'CodeAndName',
+            enableKeyEvents: true,
+            listeners: {
+                keyup: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _this.onRefreshClick();
+                    }
+                }
+            }
+
+        });
+
 //        this.storeEnterpCode = Ext.create('DsExt.ux.RefTableStore', {
 //            fields: [
 //                { name: 'CUSTOMER', type: 'string' },
@@ -13165,7 +13192,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
-                        items: [this.comboxOpLb, this.comboxBLNOTYPE, {
+                        items: [this.comboxOpLb, this.comboxCust,this.comboxBLNOTYPE, {
                             //                          fieldLabel: '发票号',
                             name: 'PS_INVNO',
                             flex: 0.7,
@@ -13190,7 +13217,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
                                     }
                                 }
                             }
-                            }, this.comboxBLFRT,
+                            }, 
                         
 //                         {
 //                            fieldLabel: '品名',
@@ -14346,8 +14373,12 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
         var PS_CUSTSERVICE = form.findField('PS_CUSTSERVICE').getValue();
         sql = sql + getAndConSql(sql, PS_CUSTSERVICE, "B.CUSTSERVICE='" + PS_CUSTSERVICE + "'");
 
-        var BLFRT = form.findField('BLFRT').getValue();
-        sql = sql + getAndConSql(sql, BLFRT, "B.BLFRT='" + BLFRT + "'");
+
+        var CUSTNAME = form.findField('CUSTNAME').getValue();
+        sql = sql + getAndConSql(sql, CUSTNAME, " EXISTS (select 1 from ch_fee WHERE B.BSNO=ch_fee.BSNO AND ch_fee.CUSTOMERNAME='" + CUSTNAME + "')");
+
+        //var BLFRT = form.findField('BLFRT').getValue();
+        //sql = sql + getAndConSql(sql, BLFRT, "B.BLFRT='" + BLFRT + "'");
 
         var VESSEL = form.findField('PS_VESSEL').getValue();
         sql = sql + getAndConSql(sql, VESSEL, "B.VESSEL  like '%" + VESSEL + "%'");

DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/Zi_en-us.js

@@ -475,4 +475,5 @@ Zi.LAN.bottles = "每页记录数";
 Zi.LAN.CARGOID = "货物标识";
 Zi.LAN.TRADETERM = "贸易条款";
 Zi.LAN.USDINVOICEDR = "USD已开发票";
-Zi.LAN.RMBINVOICEDR = "RMB已开发票";
+Zi.LAN.RMBINVOICEDR = "RMB已开发票";
+Zi.LAN.CUSTNAME = "结算单位";

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

@@ -189,6 +189,7 @@ Zi.LAN.CARGOID = "货物标识";
 Zi.LAN.TRADETERM = "贸易条款";
 Zi.LAN.USDINVOICEDR = "USD已开发票";
 Zi.LAN.RMBINVOICEDR = "RMB已开发票";
+Zi.LAN.CUSTNAME = "结算单位";
 //Zi.LAN. = "";