diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
index e9a83410..a34c6e5e 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
@@ -1633,6 +1633,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             {
                 error = IsCreateEdiYT(headData, type, filetype, filerole, carrier);
             }
+            else if (type == "CSSA")
+            {
+                error = IsCreateEdiCSSA(headData, type, filetype, filerole, carrier);
+            }
             else if (type == "CMAEDI")
             {
                 error = IsCreateCMA(headData,filetype, filerole, isbill, carrier,0,"","");
@@ -1704,6 +1708,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             {
                 result = CreateEdiYT(headData, usercode, path, mblno, filetype, filerole, ftpset, type, isbill, portload);
             }
+            else if (type == "CSSA")
+            {
+                result = CreateCSSAXmlStr(headData, usercode, path, mblno, filetype, filerole, ftpset, type, isbill, portload);
+            }
             else if (type == "CMAEDI")
             {
                 if (filetype=="E")
@@ -43409,7 +43417,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
             }
             return error;
         }
-        public static string CreateCSSAXmlStr(List<MsOpSeae> headData, string usercode, string path, string mblno, string filerole, CodeFtpSet ftpset, int isbill, string carrier, string filetype, int IsNADFW, string tbNADFWID, string tbNADFW)
+        public static string CreateCSSAXmlStr(List<MsOpSeae> headData, string usercode, string path, string mblno, string filetype, string filerole, CodeFtpSet ftpset, string type, int isbill, string carrier)
         {
             string tmpfilename = mblno + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".XML";
             string filename = path + "\\" + tmpfilename;
@@ -43508,7 +43516,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                         {
                             for (var i = 0; i < ShippingList.Count; i++)
                             {
-                                r.WriteLine("<text>" + ShippingList[i] + "</text>");
+                                r.WriteLine("<text>" + formatEdiStr("xml",ShippingList[i]) + "</text>");
                             }
                         }
                         r.WriteLine("</shipper>");
@@ -43525,7 +43533,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                         {
                             for (var i = 0; i < ShippingList.Count; i++)
                             {
-                                r.WriteLine("<text>" + ShippingList[i] + "</text>");
+                                r.WriteLine("<text>" + formatEdiStr("xml", ShippingList[i]) + "</text>");
                             }
                         }
                         r.WriteLine("</consignee>");
@@ -43543,11 +43551,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                         {
                             for (var i = 0; i < ShippingList.Count; i++)
                             {
-                                r.WriteLine("<text>" + ShippingList[i] + "</text>");
+                                r.WriteLine("<text>" + formatEdiStr("xml",ShippingList[i]) + "</text>");
                             }
                         }
                         r.WriteLine("</notifyparty>");
-                        r.WriteLine("<ordermemo>" + billams.ORDERREMARK + "</ordermemo>");
+                        r.WriteLine("<ordermemo>" + formatEdiStr("xml", billams.ORDERREMARK) + "</ordermemo>");
                         r.WriteLine("<numberoforiginals>" + GetBillNum(bill.NOBILL) + "</numberoforiginals>");
                         r.WriteLine("<numberofcopys>" + GetBillNum(bill.COPYNOBILL) + "</numberofcopys>");
                         r.WriteLine("<placeofissuecode>" +GetPortEDICode(bill.ISSUEPLACEID,"CSSA") + "</placeofissuecode>");
@@ -43677,7 +43685,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 {
                     for (var i = 0; i < ShippingList.Count; i++)
                     {
-                        r.WriteLine("<text>" + ShippingList[i] + "</text>");
+                        r.WriteLine("<text>" + formatEdiStr("xml", ShippingList[i]) + "</text>");
                     }
                 }
                 r.WriteLine("</marksandnumbers>");
@@ -43703,7 +43711,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
                 {
                     for (var i = 0; i < ShippingList.Count; i++)
                     {
-                        r.WriteLine("<text>" + ShippingList[i] + "</text>");
+                        r.WriteLine("<text>" + formatEdiStr("xml", ShippingList[i]) + "</text>");
                     }
                 }
                 r.WriteLine("</description>");
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index e2f7b7ee..37baac10 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -4944,6 +4944,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                         handler: function (menu, event) {
                             _this.onCreateEDIClick(menu, event, 'NHEDI');
                         }
+                    }, {
+                        text: Zi.LAN.EDICSSA, //"阳明EDI",
+                        id: 'EDI-CSSA',
+                        hidden: true,
+                        handler: function (menu, event) {
+                            _this.onCreateEDIClick(menu, event, 'CSSA');
+                        }
                     }
                 ],
                 scope: this
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
index 592478d1..66fb2ad3 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
@@ -260,7 +260,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                 } else if (value == '提交审核') {
                     meta.tdCls = 'feestatus_refer';
                 } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_refer';
+                    meta.tdCls = 'feestatus_settlepart';
                 } else if (value == '结算完毕') {
                     meta.tdCls = 'feestatus_settle';
                 } else if (value == '未录入') {
@@ -302,7 +302,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                     meta.tdCls = 'feestatus_settle';
                 } else if (value == '未录入') {
                 } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_settle';
+                    meta.tdCls = 'feestatus_settlepart';
                 } else if (value == '部分审核') {
                     meta.tdCls = 'feestatus_refer';
                 } else if (value == '部分提交') {
@@ -2593,6 +2593,13 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
                         handler: function (menu, event) {
                             _this.onCreateEDIClick(menu, event, 'RUSSIAEDI');
                         }
+                    }, {
+                        text: Zi.LAN.EDICSSA, //"远大EDI",
+                        hidden: true,
+                        id: 'EDI-CSSA',
+                        handler: function (menu, event) {
+                            _this.onCreateEDIClick(menu, event, 'CSSA');
+                        }
                     }
                 ],
                 scope: this
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleCXProfitShareIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleCXProfitShareIndex.js
index b6e3f54f..6ba2e189 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleCXProfitShareIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleCXProfitShareIndex.js
@@ -601,6 +601,25 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, {
         });
 
 
+        //客户加载_仓库
+        this.storeWAREHOUSE = Ext.create('DsExt.ux.RefTableStore', {
+            model: 'DsShipping.ux.CustomRefModel',
+            proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListWAREHOUSE' }
+        });
+        this.storeWAREHOUSE.load();
+        //车队
+        this.comboxWAREHOUSE = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: '优质航线', //'仓库',
+            store: this.storeWAREHOUSE,
+//            forceSelection: true,
+            queryMode: 'remote',
+            minChars: 0,
+            queryParam: 'CODENAME',
+            name: 'WAREHOUSE',
+            valueField: 'CustName',
+            displayField: 'CodeAndName'
+        });
+
         //#endregion
 
 
@@ -667,7 +686,7 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, {
                                     }
                                 }
                             }
-                            , this.CheckAllDR
+                            , this.comboxWAREHOUSE
                        ]
                     }
                     ]//end items(fieldset 1)
@@ -984,9 +1003,13 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, {
 
         var SALE = form.findField('PS_SALE').getValue();
         sql = sql + getAndConSql(sql, SALE, "B.SALE='" + SALE + "'");
-        if (this.CheckAllDR.checked) {
-            sql = sql + getAndConSql(sql, "11", " isnull(B.ISFUMIGATION,0)<>1 ");
-        }
+
+
+        var WAREHOUSE = form.findField('WAREHOUSE').getValue();
+        sql = sql + getAndConSql(sql, WAREHOUSE, "B.WAREHOUSE='" + WAREHOUSE + "'");
+        //if (this.CheckAllDR.checked) {
+        //    sql = sql + getAndConSql(sql, "11", " isnull(B.ISFUMIGATION,0)<>1 ");
+        //}
 
 
         return sql;