diff --git a/DSWeb/Areas/Account/Controllers/Chfee_lockController.cs b/DSWeb/Areas/Account/Controllers/Chfee_lockController.cs
index 880a759b..5d4b19b6 100644
--- a/DSWeb/Areas/Account/Controllers/Chfee_lockController.cs
+++ b/DSWeb/Areas/Account/Controllers/Chfee_lockController.cs
@@ -143,6 +143,7 @@ namespace DSWeb.Areas.Account.Controllers
             strSql.Append(",case ISNULL(C.ETDCLOSE,0) when 1 then '已锁定' else '未锁定' end as ETDCLOSEREF");
             strSql.Append(",case ISNULL(C.DRCLOSE,0) when 1 then '已锁定' else '未锁定' end as DRCLOSEREF");
             strSql.Append(",case ISNULL(C.CRCLOSE,0) when 1 then '已锁定' else '未锁定' end as CRCLOSEREF");
+            strSql.Append(",(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
 
             strSql.Append(" FROM V_OP_BILL B ");
             strSql.Append(" LEFT JOIN (SELECT BSNO,isnull(SUM(CASE FEETYPE WHEN 1 THEN(CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT, 0) ELSE 0 END) ELSE 0 END), 0) AS RMBDR,");
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js b/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js
index cadeeec8..599821db 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js
+++ b/DSWeb/Areas/Account/Viewsjs/Chfee_lock/Chfee_lock.js
@@ -110,6 +110,7 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
             	{ name: 'BSCLOSEOP', type: 'string' },
             	{ name: 'FEECLOSETIME', type: 'string' },
             	{ name: 'FEECLOSEOP', type: 'string' },
+            	{ name: 'SALECORP', type: 'string' },
                 { name: 'NETWEIGHT', type: 'number' },
                 { name: 'KGS', type: 'number' },
                 { name: 'TEU', type: 'number' },
@@ -617,6 +618,11 @@ Ext.extend(Shipping.MsChfeelock, Ext.Panel, {
                 dataIndex: 'CNTRTOTAL',
                 header: '箱型箱量',
                 width: 80
+            }, {
+                sortable: true,
+                dataIndex: 'SALECORP',
+                header: '所属分部',
+                width: 80
             }, {
                 sortable: true,
                 dataIndex: 'REMARK',
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
index 1b662bd6..6d56deb0 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
@@ -389,66 +389,66 @@ namespace DSWeb.MvcShipping.Controllers
                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
             }
 
-            var FEESAVENOTSAMEAMOUNT = MsSysParamSetDAL.GetData("PARAMNAME='FEESAVENOTSAMEAMOUNT'");
-            if (FEESAVENOTSAMEAMOUNT.PARAMVALUE == "1"&& feetype==2)
-            {
-                var oldfeelist = MsChFeeDAL.GetAllDataList("BSNO='" + bsno + "' AND FEETYPE=2");
-                var findlist = new List<MsChFee>();
-                foreach (var fee in oldfeelist)
-                {
-                    var newfee = bodyList.Find(X => X.GId == fee.GId);
-                    if (newfee == null&&fee.FeeType == 2)
-                    {
-                        var newinvlink = findlist.Find(X => X.Currency == fee.Currency && X.CustomerName == fee.CustomerName && X.Amount == fee.Amount);
-                        if (newinvlink == null)
-                        {
-                            var InvLink = new MsChFee();
-                            InvLink.Currency = fee.Currency;
-                            InvLink.CustomerName = fee.CustomerName;
-                            InvLink.Amount = fee.Amount;
-                            findlist.Add(InvLink);
-                        }
-                        else
-                        {
-                            var jsonRespose3 = new JsonResponse
-                            {
-                                Success = false,
-                                Message = "客户名称，金额，币别  ，相同，不允许保存，请调整！",
-                            };
-                            return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose3) };
-
-                        }
-                    }
-                }
+           // var FEESAVENOTSAMEAMOUNT = MsSysParamSetDAL.GetData("PARAMNAME='FEESAVENOTSAMEAMOUNT'");
+           // if (FEESAVENOTSAMEAMOUNT.PARAMVALUE == "1"&& feetype==2)
+           // {
+           //     var oldfeelist = MsChFeeDAL.GetAllDataList("BSNO='" + bsno + "' AND FEETYPE=2");
+           //     var findlist = new List<MsChFee>();
+           //     foreach (var fee in oldfeelist)
+           //     {
+           //         var newfee = bodyList.Find(X => X.GId == fee.GId);
+           //         if (newfee == null&&fee.FeeType == 2)
+           //         {
+           //             var newinvlink = findlist.Find(X => X.Currency == fee.Currency && X.CustomerName == fee.CustomerName && X.Amount == fee.Amount);
+           //             if (newinvlink == null)
+           //             {
+           //                 var InvLink = new MsChFee();
+           //                 InvLink.Currency = fee.Currency;
+           //                 InvLink.CustomerName = fee.CustomerName;
+           //                 InvLink.Amount = fee.Amount;
+           //                 findlist.Add(InvLink);
+           //             }
+           //             else
+           //             {
+           //                 var jsonRespose3 = new JsonResponse
+           //                 {
+           //                     Success = false,
+           //                     Message = "客户名称，金额，币别  ，相同，不允许保存，请调整！",
+           //                 };
+           //                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose3) };
+
+           //             }
+           //         }
+           //     }
        
-                foreach (var fee in bodyList)
-                {
-                    if (fee.FeeType == 2)
-                    {
-                        var newinvlink = findlist.Find(X => X.Currency == fee.Currency && X.CustomerName == fee.CustomerName && X.Amount == fee.Amount);
-                        if (newinvlink == null)
-                        {
-                            var InvLink = new MsChFee();
-                            InvLink.Currency = fee.Currency;
-                            InvLink.CustomerName = fee.CustomerName;
-                            InvLink.Amount = fee.Amount;
-                            findlist.Add(InvLink);
-                        }
-                        else
-                        {
-                            var jsonRespose3 = new JsonResponse
-                            {
-                                Success = false,
-                                Message = "客户名称，金额，币别  ，相同，不允许保存，请调整！",
-                            };
-                            return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose3) };
-
-                        }
-                    }
-                }
-
-
-           }
+           //     foreach (var fee in bodyList)
+           //     {
+           //         if (fee.FeeType == 2)
+           //         {
+           //             var newinvlink = findlist.Find(X => X.Currency == fee.Currency && X.CustomerName == fee.CustomerName && X.Amount == fee.Amount);
+           //             if (newinvlink == null)
+           //             {
+           //                 var InvLink = new MsChFee();
+           //                 InvLink.Currency = fee.Currency;
+           //                 InvLink.CustomerName = fee.CustomerName;
+           //                 InvLink.Amount = fee.Amount;
+           //                 findlist.Add(InvLink);
+           //             }
+           //             else
+           //             {
+           //                 var jsonRespose3 = new JsonResponse
+           //                 {
+           //                     Success = false,
+           //                     Message = "客户名称，金额，币别  ，相同，不允许保存，请调整！",
+           //                 };
+           //                 return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose3) };
+
+           //             }
+           //         }
+           //     }
+
+
+           //}
 
 
                 if (isyj == "1")
diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeModuleController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeModuleController.cs
index d31b56b7..82a8b79a 100644
--- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeModuleController.cs
+++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeModuleController.cs
@@ -88,10 +88,10 @@ namespace DSWeb.MvcShipping.Controllers
 
 
             ////分公司代码
-            //if (headData.CORPID == "" || headData.CORPID == null)
-            //{
-            //    headData.CORPID = Convert.ToString(Session["COMPANYID"]);
-            //}
+            if (headData.CORPID == "" || headData.CORPID == null)
+            {
+                headData.CORPID = Convert.ToString(Session["COMPANYID"]);
+            }
 
             //分公司代码
             if (headData.GID == "" || headData.GID == null)
@@ -103,7 +103,8 @@ namespace DSWeb.MvcShipping.Controllers
             if (opstatus == "add")
             {
                 headData.DbOperationType = DbOperationType.DbotIns;
-                //
+                headData.INPUTBY =Convert.ToString(Session["SHOWNAME"]).ToString().Trim();
+                headData.INPUTDATE = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             }
             else if (opstatus == "edit")
             {
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
index cca20a32..edf21713 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
@@ -91,7 +91,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
         private const string PARM_FEE_ISACC = "@ISACC";
         private const string PARM_SALECORP = "@SALECORP";
         private const string PARM_FEE_ISCRMORDERFEE = "@ISCRMORDERFEE";
-
+        private const string PARM_FEE_STATEMENTNO = "@STATEMENTNO";
 
         #endregion
         static private SqlParameter[] GetInsertParms()
@@ -135,7 +135,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                    new SqlParameter(PARM_MANAGER,SqlDbType.VarChar,50),
                    new SqlParameter(PARM_FEE_ISACC,SqlDbType.VarChar,1),
                    new SqlParameter(PARM_SALECORP,SqlDbType.VarChar,60),
-                   new SqlParameter(PARM_FEE_ISCRMORDERFEE,SqlDbType.VarChar,1)
+                   new SqlParameter(PARM_FEE_ISCRMORDERFEE,SqlDbType.VarChar,1),
+                   new SqlParameter(PARM_FEE_STATEMENTNO,SqlDbType.VarChar,60)
 
 
             };
@@ -146,16 +147,16 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
 
         private const string SQL_INSERT_FEE = " INSERT INTO ch_fee(GID, BSNO, FEETYPE, FEENAME, FEEDESCRIPTION, CUSTOMERTYPE, CUSTOMERNAME, UNIT, UNITPRICE, QUANTITY, AMOUNT, CURRENCY, "
                                             + " EXCHANGERATE, REASON, REMARK, COMMISSIONRATE,ENTEROPERATOR, ENTERDATE,ISOPEN, ISADVANCEDPAY, SORT, FEESTATUS, FEEFRT,  "
-                                            + " TAXRATE,NOTAXAMOUNT,ACCTAXRATE,LINENUM,TAXUNITPRICE,MODIFIEDUSER,MODIFIEDTIME,WMSOUTBSNO,PREAMOUNT,ISINVOICE,INPUTMODE,LOCALCURR,MANAGER,ISACC,SALECORP,ISCRMORDERFEE) "
+                                            + " TAXRATE,NOTAXAMOUNT,ACCTAXRATE,LINENUM,TAXUNITPRICE,MODIFIEDUSER,MODIFIEDTIME,WMSOUTBSNO,PREAMOUNT,ISINVOICE,INPUTMODE,LOCALCURR,MANAGER,ISACC,SALECORP,ISCRMORDERFEE,STATEMENTNO) "
                                             + " VALUES "
                                             + " (@gid,@bsno,@fee_type,@fee_name,@fee_description,@customer_type,@customer_name,@unit,@unit_price,@quantity,@amount,@currency, "
                                             + " @exchange_rate,@reason,@remark,@comm_rate,@enter_operator,@enter_date,@is_open,@is_advance_pay,@sort,@fee_status,@fee_frt, "
-                                            + " @taxrate,@notaxamount,@acctaxrate,@LINENUM,@taxunit_price,@MODIFIEDUSER,@MODIFIEDTIME,@WMSOUTBSNO,@PREAMOUNT,@ISINVOICE,@INPUTMODE,@LOCALCURR,@MANAGER,@ISACC,@SALECORP,@ISCRMORDERFEE)";//DateTime.Now.ToString()
+                                            + " @taxrate,@notaxamount,@acctaxrate,@LINENUM,@taxunit_price,@MODIFIEDUSER,@MODIFIEDTIME,@WMSOUTBSNO,@PREAMOUNT,@ISINVOICE,@INPUTMODE,@LOCALCURR,@MANAGER,@ISACC,@SALECORP,@ISCRMORDERFEE,@STATEMENTNO)";//DateTime.Now.ToString()
 
         private const string SQL_UPDATE_CH_FE = " UPDATE ch_fee SET FEENAME = @fee_name,FEEDESCRIPTION=@fee_description,CUSTOMERTYPE=@customer_type,CUSTOMERNAME = @customer_name,UNIT = @unit,UNITPRICE = @unit_price,QUANTITY = @quantity,COMMISSIONRATE = @comm_rate,"
                                               + " AMOUNT = @amount,CURRENCY = @currency,EXCHANGERATE = @exchange_rate,FEEFRT = @fee_frt,REMARK = @remark,ISADVANCEDPAY = @is_advance_pay,"
                                               + " WMSOUTBSNO=@WMSOUTBSNO,LINENUM=@LINENUM,TaxRate=@TAXRATE,NoTaxAmount=@NOTAXAMOUNT,AccTaxRate=@ACCTAXRATE,TAXUNITPRICE=@TAXUNITPRICE,PREAMOUNT=@PREAMOUNT,"
-                                              + "MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME,ISOPEN = @ISOPEN,IsInvoice=@IsInvoice,INPUTMODE=@INPUTMODE,LOCALCURR=@LOCALCURR,MANAGER=@MANAGER,ISACC=@ISACC,SALECORP=@SALECORP,ISCRMORDERFEE=@ISCRMORDERFEE WHERE GID = @gid ";
+                                              + "MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME,ISOPEN = @ISOPEN,IsInvoice=@IsInvoice,INPUTMODE=@INPUTMODE,LOCALCURR=@LOCALCURR,MANAGER=@MANAGER,ISACC=@ISACC,SALECORP=@SALECORP,ISCRMORDERFEE=@ISCRMORDERFEE,STATEMENTNO=@STATEMENTNO WHERE GID = @gid ";
 
 
         private const string SQL_INSERT_ORDERFEE = " INSERT INTO ch_fee_order(GID, BSNO, FEETYPE, FEENAME, FEEDESCRIPTION, CUSTOMERTYPE, CUSTOMERNAME, UNIT, UNITPRICE, QUANTITY, AMOUNT, CURRENCY, "
@@ -328,7 +329,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                                 };
                             }
                             else parms[38].Value = "0";
-
+                            parms[39].Value = feeEntity.STATEMENTNO;
 
                             SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, SQL_INSERT_FEE, parms);
                         }
@@ -366,7 +367,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                                 new SqlParameter("@MANAGER",SqlDbType.VarChar,60),
                                 new SqlParameter("@ISACC",SqlDbType.VarChar,1),
                                 new SqlParameter("@SALECORP",SqlDbType.VarChar,60),
-                                new SqlParameter("@ISCRMORDERFEE",SqlDbType.VarChar,1)
+                                new SqlParameter("@ISCRMORDERFEE",SqlDbType.VarChar,1),
+                                new SqlParameter("@STATEMENTNO",SqlDbType.VarChar,60)
 
                             };
 
@@ -497,7 +499,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                                 }
                             }
                             else updateParms[31].Value = "0";
-
+                            updateParms[32].Value = feeEntity.STATEMENTNO;
                             SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, SQL_UPDATE_CH_FE, updateParms);
                         }
                     }
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeModule/MsOpSeaeModuleDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeModule/MsOpSeaeModuleDAL.cs
index c275a844..79bbbe4b 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeModule/MsOpSeaeModuleDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeModule/MsOpSeaeModuleDAL.cs
@@ -58,8 +58,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
             strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,");
             strSql.Append("NOBILL,ISSUETYPE,ISSUEPLACE,BLFRT,PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,");
             strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,INPUTDATE,");
-            strSql.Append("INPUTBY,PLACERECEIPTID,REMARKS,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
-            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN]");
+            strSql.Append("INPUTBY,PLACERECEIPTID,REMARK,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
+            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN],CUSTOMERNAME");
             strSql.Append(" from op_seae_module ");
 
             if (!string.IsNullOrEmpty(strCondition))
@@ -100,8 +100,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
             strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,");
             strSql.Append("NOBILL,ISSUETYPE,ISSUEPLACE,BLFRT,PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,");
             strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,INPUTDATE,");
-            strSql.Append("INPUTBY,PLACERECEIPTID,REMARKS,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
-            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN]");
+            strSql.Append("INPUTBY,PLACERECEIPTID,REMARK,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
+            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN],CUSTOMERNAME");
             strSql.Append(" from op_seae_module ");
 
             if (!string.IsNullOrEmpty(strCondition))
@@ -129,8 +129,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
             strSql.Append("PlACERECEIPT,PORTLOADID,PORTLOAD,PORTDISCHARGEID,PORTDISCHARGE,PLACEDELIVERYID,PLACEDELIVERY,DESTINATIONID,DESTINATION,");
             strSql.Append("NOBILL,ISSUETYPE,ISSUEPLACE,BLFRT,PREPARDAT,PAYABLEAT,[SERVICE],MARKS,NOPKGS,[DESCRIPTION],GOODSNAME,");
             strSql.Append("GROSSWEIGHT,MEASUREMENT,PKGS,KINDPKGS,KGS,CBM,TOTALNO,INPUTDATE,");
-            strSql.Append("INPUTBY,PLACERECEIPTID,REMARKS,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
-            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN]");
+            strSql.Append("INPUTBY,PLACERECEIPTID,REMARK,HSCODE,CARGOID,COPYNOBILL,[DCLASS],[DUNNO],[REEFERF],[HUMIDITY],[TEMPID],[TEMPSET],[TEMPMAX],");
+            strSql.Append("[TEMPMIN],[DPAGE],[DLABEL],[LINKMAN],CUSTOMERNAME");
             strSql.Append(" from op_seae_module ");
 
             if (!string.IsNullOrEmpty(condition))
@@ -206,7 +206,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
                     data.PAYABLEAT = Convert.ToString(reader["PAYABLEAT"]);//到付地点
                     data.SERVICE = Convert.ToString(reader["SERVICE"]);//运输条款
                     data.MARKS = Convert.ToString(reader["MARKS"]);//唛头
-                    data.REMARKS = Convert.ToString(reader["REMARKS"]);//唛头
+                    data.REMARK = Convert.ToString(reader["REMARK"]);//唛头
                     data.DCLASS = Convert.ToString(reader["DCLASS"]);//唛头
                     data.DUNNO = Convert.ToString(reader["DUNNO"]);//发货人
                     data.REEFERF = Convert.ToString(reader["REEFERF"]);//发货人
@@ -223,6 +223,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
                     data.COPYNOBILL = Convert.ToString(reader["COPYNOBILL"]);//
                     if (reader["INPUTDATE"] != DBNull.Value)
                         data.INPUTDATE = Convert.ToDateTime(reader["INPUTDATE"]).ToString("yyyy-MM-dd HH:mm:ss");//签单日期
+                    data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);//
                     #endregion
                     headList.Add(data);
                 }
@@ -292,7 +293,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
                     data.PAYABLEAT = Convert.ToString(reader["PAYABLEAT"]);//到付地点
                     data.SERVICE = Convert.ToString(reader["SERVICE"]);//运输条款
                     data.MARKS = Convert.ToString(reader["MARKS"]);//唛头
-                    data.REMARKS = Convert.ToString(reader["REMARKS"]);//唛头
+                    data.REMARK = Convert.ToString(reader["REMARK"]);//唛头
                     data.DCLASS = Convert.ToString(reader["DCLASS"]);//唛头
                     data.DUNNO = Convert.ToString(reader["DUNNO"]);//发货人
                     data.REEFERF = Convert.ToString(reader["REEFERF"]);//发货人
@@ -387,13 +388,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeModuleDAL
                 }
                 else
                 {
-                    str = " UPPER(Corpid)='" + companyid + "'";
+                    str = " 1=1";
                 }
 
             }
             else if (visiblerange == "1")
             {
-                str = " UPPER(Corpid)='" + companyid + "'";
+                str = " 1=1";
             }
             return str;
         }
diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpSeaeModule/MsOpSeaeModule.cs b/DSWeb/Areas/MvcShipping/Models/MsOpSeaeModule/MsOpSeaeModule.cs
index 269b9344..25b9729f 100644
--- a/DSWeb/Areas/MvcShipping/Models/MsOpSeaeModule/MsOpSeaeModule.cs
+++ b/DSWeb/Areas/MvcShipping/Models/MsOpSeaeModule/MsOpSeaeModule.cs
@@ -60,10 +60,10 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeModule
         
         
 		private string _inputby = "";
-		/// <summary>
-		/// 录入人
+        /// <summary>
+        /// 录入人
         /// </summary>
-        [ModelDB]
+        [ModelDB(MDBType = ModelDBOprationType.Insert)]
         public string INPUTBY
         {
             get{ return _inputby; }
@@ -480,16 +480,6 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeModule
         }
 
 
-        private string _cntrno = "";
-        /// <summary>
-        /// 集装箱大写
-        /// </summary>
-        [ModelDB]
-        public string CNTRNO
-        {
-            get { return _cntrno; }
-            set { _cntrno = value; }
-        }
 
   
 
@@ -539,7 +529,7 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeModule
         /// 备注
         /// </summary>
         [ModelDB]
-        public string REMARKS
+        public string REMARK
         {
             get { return _remarks; }
             set { _remarks = value; }
@@ -704,7 +694,10 @@ namespace DSWeb.MvcShipping.Models.MsOpSeaeModule
             get { return _INPUTDATE; }
             set { _INPUTDATE = value; }
         }
-    
+        [ModelDB]
+        public string CUSTOMERNAME { get; set; }
+        [ModelDB(MDBType = ModelDBOprationType.Insert)]
+        public string CORPID { get; set; }
 
         #endregion
 
diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
index b2d7e94d..9e95a7a8 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
@@ -33,6 +33,17 @@
         DEPTNAME = '<%= Session["DEPTNAME"] %>';
     }
     getSessgion5();
+    var strLANGUAGES;
+    function getSessgion6() {
+        strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
+        if (strLANGUAGES == "en-us") {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js\"></sc' + 'ript>');
+        }
+        else {
+            document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js\"></sc' + 'ript>');
+        }
+    }
+    getSessgion6();
 </script>
 
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
@@ -44,6 +55,16 @@
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireModel.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeAirPort/MsCodeAirPortModel.js"></script>
 <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEditView.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/AireFee.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeComm.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAudit.js"></script>
+<%--<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js"></script>--%> 
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js"></script> 
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/AireAmendFee.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillModel.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpBillEdit.js"></script>
+<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenIndex.js"></script>
     <script type="text/javascript"">
 
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
index 5a4f561a..77a9b470 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
@@ -48,7 +48,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
         this.AMENDSELFWORKFLOW = 0;
         this.FEENOTPR=false;
         this.ISWACC=0;
-        this.FEEMANGERMUSTBE=0;
+        this.FEEMANGERMUSTBE = 0;
+        this.FEESAVENOTSAMEAMOUNT = 0;
         this.MODIFYCUSTBFFEELOCK=0;
         this.DrRangDaStr=" 1=1 ";
         this.CrRangDaStr=" 1=1 ";
@@ -1265,7 +1266,12 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'STATEMENTNO',
-            header: Zi.LAN.FEE.STATEMENTNO,
+             header: Zi.LAN.FEE.STATEMENTNO,
+             editor: {
+                 xtype: 'textfield',
+                 selectOnFocus: true,
+                 enableKeyEvents: true
+             },
             width: 100
         }
             ];
@@ -2404,7 +2410,12 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
         }, {
             sortable: true,
             dataIndex: 'STATEMENTNO',
-            header: Zi.LAN.FEE.STATEMENTNO,
+                header: Zi.LAN.FEE.STATEMENTNO,
+                editor: {
+                    xtype: 'textfield',
+                    selectOnFocus: true,
+                    enableKeyEvents: true
+                },
             width: 100
         }
             ];
@@ -5673,6 +5684,33 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             },
             scope: this
         });
+        Ext.Ajax.request({
+            waitMsg: '',
+            url: '/MvcShipping/MsSysParamSet/GetData',
+            params: {
+                condition: "PARAMNAME='FEESAVENOTSAMEAMOUNT'"
+            },
+            callback: function (options, success, response) {
+                if (success) {
+                    var result = Ext.JSON.decode(response.responseText);
+                    if (result.Success != true) {
+
+                    } else {
+                        var data = result.data;
+                        if (data.PARAMVALUE == '1') {
+                            this.FEESAVENOTSAMEAMOUNT = 1;
+                        } else {
+
+                        }
+
+                    }
+                } else {
+
+                }
+            },
+            scope: this
+        });
+
             Ext.Ajax.request({
                 waitMsg: '',
                 url: '/MvcShipping/MsBaseInfo/GetUserModuleEnable',
@@ -7274,7 +7312,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
 
         var bodyDrChFeeDatas = [];
         var i;
-
+        this.isrepeatfee = 0;
         if (type == '1') {
             for (i = 0; i < this.storeDrChFee.getCount(); i += 1) {
                 var memberyf = this.storeDrChFee.getAt(i);
@@ -7291,7 +7329,10 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             };
             var jsonChFeeBody = ConvertFeeRecordsToJson(bodyDrChFeeDatas);
         } else if (type == '2') {
-
+            this.TMPstoreDrChFee = Ext.create('Ext.data.Store', {
+                model: 'MsChFee',
+                remoteSort: false
+            });
             for (i = 0; i < this.storeCrChFee.getCount(); i += 1) {
                 var memberyf = this.storeCrChFee.getAt(i);
                 if (memberyf.data.Currency ==LOCALCURR&&memberyf.data.ExChangerate!=1) {
@@ -7304,11 +7345,27 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                 bodyDrChFeeDatas.push(memberyf);
                 var amount = memberyf.data.Amount;
                 var ExChangerate = memberyf.data.ExChangerate;
+                if (this.FEESAVENOTSAMEAMOUNT == 1) {
+                    for (var j = 0; j < this.TMPstoreDrChFee.getCount(); j += 1) {
+                        var memberbody = this.TMPstoreDrChFee.getAt(j);
+                        if (memberbody.data.CustomerName == memberyf.data.CustomerName && memberbody.data.FeeName == memberyf.data.FeeName
+                            && memberbody.data.Amount == memberyf.data.Amount && memberbody.data.Currency == memberyf.data.Currency)
+                        {
+                            this.isrepeatfee = 1
+                        }
+                    }
+                    if (this.isrepeatfee == 0) {
+                        this.TMPstoreDrChFee.add(memberyf);
+                    }
+                }
 
             };
             var jsonChFeeBody = ConvertFeeRecordsToJson(bodyDrChFeeDatas);
         }else if (type == '3') {
-
+            this.TMPstoreDrChFee = Ext.create('Ext.data.Store', {
+                model: 'MsChFee',
+                remoteSort: false
+            });
             for (i = 0; i < this.storeDrChFee.getCount(); i += 1) {
                 var memberyf = this.storeDrChFee.getAt(i);
                 if (memberyf.data.Currency ==LOCALCURR&&memberyf.data.ExChangerate!=1) {
@@ -7333,6 +7390,18 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
                 bodyDrChFeeDatas.push(memberyf);
                 var amount = memberyf.data.Amount;
                 var ExChangerate = memberyf.data.ExChangerate;
+                if (this.FEESAVENOTSAMEAMOUNT == 1) {
+                    for (var j = 0; j < this.TMPstoreDrChFee.getCount(); j += 1) {
+                        var memberbody = this.TMPstoreDrChFee.getAt(j);
+                        if (memberbody.data.CustomerName == memberyf.data.CustomerName && memberbody.data.FeeName == memberyf.data.FeeName
+                            && memberbody.data.Amount == memberyf.data.Amount && memberbody.data.Currency == memberyf.data.Currency) {
+                            this.isrepeatfee = 1
+                        }
+                    }
+                    if (this.isrepeatfee == 0) {
+                        this.TMPstoreDrChFee.add(memberyf);
+                    }
+                }
 
             };
             var jsonChFeeBody = ConvertFeeRecordsToJson(bodyDrChFeeDatas);
@@ -7343,69 +7412,96 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
             Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: '请先保存业务信息！', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
             return;
         }
-        Ext.Msg.wait(Zi.LAN.FEE.ZhengZaiCaoZuoShuJu);
-        Ext.Ajax.request({
-            waitMsg: Zi.LAN.FEE.ZhengZaiCaoZuoShuJu, //'正在保存数据...',
-            url: '/MvcShipping/MsChFee/Save',
-            scope: this,
-            params: {
-                bsno: _thisfee.strBSNO,
-                type: type,
-                chfeebody: jsonChFeeBody
-            },
-            callback: function (options, success, response) {
-                if (success) {
-                    Ext.MessageBox.hide();
-                    var jsonresult = Ext.JSON.decode(response.responseText);
-                    if (jsonresult.Success) {
-                        //                        if (type == '1') {
-                        //                            for (var i = 0; i < this.storeDrChFee.getCount(); i += 1) {
-                        //                                var member = this.storeDrChFee.getAt(i);
-                        //                                member.set("BsNo", _thisfee.strBSNO);
-                        //                                member.commit();
-                        //                            }
-                        ////                            this.gridDrChFee.unSelectAll();
-                        //                        } else if (type == '2') {
-                        //                            for (var i = 0; i < this.storeCrChFee.getCount(); i += 1) {
-                        //                                var member = this.storeCrChFee.getAt(i);
-                        //                                member.set("BsNo", _thisfee.strBSNO);
-                        //                                member.commit();
-                        //                            }
-                        ////                            this.gridCrChFee.unSelectAll();
-
-                        //                        }
+        if (this.FEESAVENOTSAMEAMOUNT == 1 && this.isrepeatfee == 1) {
+            Ext.MessageBox.confirm('提示', '结算对象，金额，币别，费用名称，相同，确定保存？', function (btn) {
+                if (btn == 'yes') {
+                    Ext.Msg.wait(Zi.LAN.FEE.ZhengZaiCaoZuoShuJu);
+                    Ext.Ajax.request({
+                        waitMsg: Zi.LAN.FEE.ZhengZaiCaoZuoShuJu, //'正在保存数据...',
+                        url: '/MvcShipping/MsChFee/Save',
+                        scope: this,
+                        params: {
+                            bsno: _thisfee.strBSNO,
+                            type: type,
+                            chfeebody: jsonChFeeBody
+                        },
+                        callback: function (options, success, response) {
+                            if (success) {
+                                Ext.MessageBox.hide();
+                                var jsonresult = Ext.JSON.decode(response.responseText);
+                                if (jsonresult.Success) {
 
-                        if (type == 1) {
-                            _thisfee.LoadDrChFee();
-                        } else if (type == 2) {
-                            _thisfee.LoadCrChFee();
-                        } else {
-                            _thisfee.LoadDrChFee();
-                            _thisfee.LoadCrChFee();
+                                    if (type == 1) {
+                                        _thisfee.LoadDrChFee();
+                                    } else if (type == 2) {
+                                        _thisfee.LoadCrChFee();
+                                    } else {
+                                        _thisfee.LoadDrChFee();
+                                        _thisfee.LoadCrChFee();
 
+                                    }
+                                } else {
+                                    Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                }
+                            } else {
+                                Ext.Msg.show({
+                                    title: Zi.LAN.FEE.TiShi,
+                                    msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo,
+                                    icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                                });
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            })
+        } else {
+            Ext.Msg.wait(Zi.LAN.FEE.ZhengZaiCaoZuoShuJu);
+            Ext.Ajax.request({
+                waitMsg: Zi.LAN.FEE.ZhengZaiCaoZuoShuJu, //'正在保存数据...',
+                url: '/MvcShipping/MsChFee/Save',
+                scope: this,
+                params: {
+                    bsno: _thisfee.strBSNO,
+                    type: type,
+                    chfeebody: jsonChFeeBody
+                },
+                callback: function (options, success, response) {
+                    if (success) {
+                        Ext.MessageBox.hide();
+                        var jsonresult = Ext.JSON.decode(response.responseText);
+                        if (jsonresult.Success) {
+
+                            if (type == 1) {
+                                _thisfee.LoadDrChFee();
+                            } else if (type == 2) {
+                                _thisfee.LoadCrChFee();
+                            } else {
+                                _thisfee.LoadDrChFee();
+                                _thisfee.LoadCrChFee();
+
+                            }
+                        } else {
+                            Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
                         }
-                        //this.storeChFeeGain.load({ params: { bsno: _thisfee.strBSNO, optype: _thisfee.stroplb } });
-                        //this.storeChFeeMasterGain.load({ params: { bsno: _thisfee.strBSNO, optype: _thisfee.stroplb } });
-                        //this.storeBodySum.load({ params: { bsno: _thisfee.strBSNO, optype: _thisfee.stroplb },
-                        //    callback: function (r, options, success) {
-                        //        if (success) {
-                        //            _thisfee.setTotalHead();
-                        //        }
-                        //    }
-                        //});
                     } else {
-                        Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({
+                            title: Zi.LAN.FEE.TiShi,
+                            msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo,
+                            icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                        });
                     }
-                } else {
-                    Ext.Msg.show({ title: Zi.LAN.FEE.TiShi,
-                        msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo,
-                        icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
-                    });
                 }
-            }
-        });
+            });
+        }
+
+
+
     }, //end save  
 
+
+
     onShenModifyClick: function (button, event, type) {
 
         var allow = this.getAllowOperationDetail();
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEditView.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEditView.js
index f7fec860..3d23d386 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEditView.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEditView.js
@@ -1967,7 +1967,7 @@ Ext.extend(Shipping.MsOpAireView, Ext.Panel, {
                     this.formHead.getForm().setValues(data);
                     this.formEdit.getForm().reset();
                     this.formEdit.getForm().setValues(data);
-
+                    this.editRecord = data;
 
 
                     this.Editdata = data;
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js
index 40047624..a57cfc25 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js
@@ -58,11 +58,6 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
         //#region 主grid
 
         this.initgirdcolums = [{
-            sortable: true,
-            dataIndex: 'MBLNO',
-            header: '主提单号',
-            width: 130
-        }, {
                 sortable: true,
                 dataIndex: 'TEMPLATE',
                 header: '模板名称',
@@ -143,9 +138,9 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
             })
         });
 
-        this.girdcolums = DsTruck.GetGridPanel(USERID, this.formname, this.girdcolums, 1); //使用者id，表名，中间column数组，跳过一开始的几列
-        this.gridList.reconfigure(this.storeList, this.girdcolums);
-        this.gridList.columns[1] = new Ext.grid.RowNumberer();
+        //this.girdcolums = DsTruck.GetGridPanel(USERID, this.formname, this.girdcolums, 1); //使用者id，表名，中间column数组，跳过一开始的几列
+        //this.gridList.reconfigure(this.storeList, this.girdcolums);
+        //this.gridList.columns[1] = new Ext.grid.RowNumberer();
 
         this.gridList.addListener('itemclick', function (dataview, record, item, index, e, b) {
             this.opStatus == 'edit';
@@ -215,31 +210,7 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
                         xtype: 'container',
                         layout: 'hbox',
                         defaultType: 'textfield',
-                        items: [{
-                            fieldLabel: '编号',
-                            name: 'MblNo',
-                            enableKeyEvents: true,
-                            listeners: {
-                                specialkey: function (field, e) {
-                                    if (e.getKey() == e.ENTER) {
-                                        _this.onRefreshClick();
-                                    }
-                                }
-                            }
-                        }, this.comboxCustCode,{
-                            fieldLabel: '从开船日期',
-                            format: 'Y-m-d',
-                            xtype: 'datefield',
-                            name: 'CustDate_Min',
-                            enableKeyEvents: true,
-                            listeners: {
-                                specialkey: function (field, e) {
-                                    if (e.getKey() == e.ENTER) {
-                                        _this.onRefreshClick();
-                                    }
-                                }
-                            }
-                            }, {
+                        items: [this.comboxCustCode, {
                                 fieldLabel: '模板名称',
                                 name: 'TEMPLATE',
                                 enableKeyEvents: true,
@@ -334,24 +305,13 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
                                 fieldLabel: '模板名称',
                                 //                            flex: 1.5,
                                 name: 'TEMPLATE'
-                            }]
+                            }, {
+                                    fieldLabel: '委托单位',
+                                    readOnly:true,
+                                    name: 'CUSTOMERNAME'
+                                }]
 
-                        },{
-                        xtype: 'container',
-                        layout: 'hbox',
-                        flex: 1,
-                        defaultType: 'textfield',
-                        items: [{
-                            fieldLabel: '船名',
-                            //                            flex: 1.5,
-                            name: 'VESSEL'
                         }, {
-                            fieldLabel: '航次',
-                            //                            flex: 0.5,
-                            name: 'VOYNO'
-                        }]
-
-                    }, {
                         xtype: 'container',
                         layout: 'hbox',
                         flex: 1,
@@ -648,34 +608,57 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
             tbar: [{
                 text: "调入模板信息",
                 handler: function (button, event) {
-                    this.formEdit.getForm().findField('VESSEL').setValue(this.MainEditRecord.data.VESSEL);
-                    this.formEdit.getForm().findField('VOYNO').setValue(this.MainEditRecord.data.VOYNO);
-                    this.formEdit.getForm().findField('ETD').setValue(this.MainEditRecord.data.ETD);
-                    this.formEdit.getForm().findField('PORTLOADID').setValue(this.MainEditRecord.data.PORTLOADID);
-                    this.formEdit.getForm().findField('PORTLOAD').setValue(this.MainEditRecord.data.PORTLOAD);
-                    this.formEdit.getForm().findField('PORTDISCHARGEID').setValue(this.MainEditRecord.data.PORTDISCHARGEID);
-                    this.formEdit.getForm().findField('PORTDISCHARGE').setValue(this.MainEditRecord.data.PORTDISCHARGE);
-                    this.formEdit.getForm().findField('PLACERECEIPT').setValue(this.MainEditRecord.data.PLACERECEIPT);
-                    this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(this.MainEditRecord.data.PLACEDELIVERYID);
-                    this.formEdit.getForm().findField('PLACEDELIVERY').setValue(this.MainEditRecord.data.PLACEDELIVERY);
-                    this.formEdit.getForm().findField('DESTINATIONID').setValue(this.MainEditRecord.data.DESTINATIONID);
-                    this.formEdit.getForm().findField('DESTINATION').setValue(this.MainEditRecord.data.DESTINATION);
-                    this.formEdit.getForm().findField('MARKS').setValue(this.MainEditRecord.data.MARKS);
-                    this.formEdit.getForm().findField('DESCRIPTION').setValue(this.MainEditRecord.data.DESCRIPTION);
-                    this.formEdit.getForm().findField('PLACERECEIPTID').setValue(this.MainEditRecord.data.PLACERECEIPTID);
-                    Ext.MessageBox.confirm('提示', '要调入主单的收发通信息吗？', function (btn) {
-                        if (btn == 'yes') {
-                            this.formEdit.getForm().findField('SHIPPERID').setValue(this.MainEditRecord.data.SHIPPERID);
-                            this.formEdit.getForm().findField('SHIPPER').setValue(this.MainEditRecord.data.SHIPPER);
-                            this.formEdit.getForm().findField('CONSIGNEEID').setValue(this.MainEditRecord.data.CONSIGNEEID);
-                            this.formEdit.getForm().findField('CONSIGNEE').setValue(this.MainEditRecord.data.CONSIGNEE);
-                            this.formEdit.getForm().findField('NOTIFYPARTYID').setValue(this.MainEditRecord.data.NOTIFYPARTYID);
-                            this.formEdit.getForm().findField('NOTIFYPARTY').setValue(this.MainEditRecord.data.NOTIFYPARTY);
-                        }
-                    });
-                    if (this.formEdit.getForm().findField('MBLNO').getValue() == '')
-                        this.formEdit.getForm().findField('MBLNO').setValue(this.MainEditRecord.data.MBLNO);
-                    this.formEdit.getForm().findField('ISSUEPLACE').setValue(this.MainEditRecord.data.ISSUEPLACE);
+
+                    var selections = this.gridList.getSelectionModel().getSelection();
+                    for (var i in selections) {
+                        var record = selections[i];
+                        parentWin.formEdit.getForm().findField('SHIPPER').setValue(record.data.SHIPPER);
+                        parentWin.formEdit.getForm().findField('CONSIGNEE').setValue(record.data.CONSIGNEE);
+                        parentWin.formEdit.getForm().findField('NOTIFYPARTY').setValue(record.data.NOTIFYPARTY);
+                        parentWin.formEdit.getForm().findField('MARKS').setValue(record.data.MARKS);
+                        parentWin.formEdit.getForm().findField('DESCRIPTION').setValue(record.data.DESCRIPTION);
+                        parentWin.formEdit.getForm().findField('PORTLOADID').setValue(record.data.PORTLOADID);
+                        parentWin.formEdit.getForm().findField('PORTLOAD').setValue(record.data.PORTLOAD);
+                        parentWin.formEdit.getForm().findField('PORTDISCHARGEID').setValue(record.data.PORTDISCHARGEID);
+                        parentWin.formEdit.getForm().findField('PORTDISCHARGE').setValue(record.data.PORTDISCHARGE);
+                        parentWin.formEdit.getForm().findField('KGS').setValue(record.data.KGS);
+                        parentWin.formEdit.getForm().findField('PLACERECEIPT').setValue(record.data.PLACERECEIPT);
+                        parentWin.formEdit.getForm().findField('PLACEDELIVERYID').setValue(record.data.PLACEDELIVERYID);
+                        parentWin.formEdit.getForm().findField('PLACEDELIVERY').setValue(record.data.PLACEDELIVERY);
+                        parentWin.formEdit.getForm().findField('DESTINATIONID').setValue(record.data.DESTINATIONID);
+                        parentWin.formEdit.getForm().findField('DESTINATION').setValue(record.data.DESTINATION);
+                        parentWin.formEdit.getForm().findField('NOBILL').setValue(record.data.NOBILL);
+                        parentWin.formEdit.getForm().findField('ISSUETYPE').setValue(record.data.ISSUETYPE);
+                        parentWin.formEdit.getForm().findField('ISSUEPLACE').setValue(record.data.ISSUEPLACE);
+                        parentWin.formEdit.getForm().findField('BLFRT').setValue(record.data.BLFRT);
+                        parentWin.formEdit.getForm().findField('PREPARDAT').setValue(record.data.PREPARDAT);
+                        parentWin.formEdit.getForm().findField('PAYABLEAT').setValue(record.data.PAYABLEAT);
+                        parentWin.formEdit.getForm().findField('SERVICE').setValue(record.data.SERVICE);
+                        parentWin.formEdit.getForm().findField('GOODSNAME').setValue(record.data.GOODSNAME);
+                        parentWin.formEdit.getForm().findField('PKGS').setValue(record.data.PKGS);
+                        parentWin.formEdit.getForm().findField('KINDPKGS').setValue(record.data.KINDPKGS);
+                        parentWin.formEdit.getForm().findField('CBM').setValue(record.data.CBM);
+                        parentWin.formEdit.getForm().findField('TOTALNO').setValue(record.data.TOTALNO);
+                        parentWin.formEdit.getForm().findField('REMARK').setValue(record.data.REMARK);
+                        parentWin.formEdit.getForm().findField('PLACERECEIPTID').setValue(record.data.PLACERECEIPTID);
+                        parentWin.formEdit.getForm().findField('COPYNOBILL').setValue(record.data.COPYNOBILL);
+                        parentWin.formEdit.getForm().findField('HSCODE').setValue(record.data.HSCODE);
+                        parentWin.formEdit.getForm().findField('CARGOID').setValue(record.data.CARGOID);
+                        parentWin.formEdit.getForm().findField('DCLASS').setValue(record.data.DCLASS);
+                        parentWin.formEdit.getForm().findField('DUNNO').setValue(record.data.DUNNO);
+                        parentWin.formEdit.getForm().findField('REEFERF').setValue(record.data.REEFERF);
+                        parentWin.formEdit.getForm().findField('TEMPID').setValue(record.data.TEMPID);
+                        parentWin.formEdit.getForm().findField('TEMPSET').setValue(record.data.TEMPSET);
+                        parentWin.formEdit.getForm().findField('TEMPMAX').setValue(record.data.TEMPMAX);
+                        parentWin.formEdit.getForm().findField('TEMPMIN').setValue(record.data.TEMPMIN);
+                        parentWin.formEdit.getForm().findField('HUMIDITY').setValue(record.data.HUMIDITY);
+                        parentWin.formEdit.getForm().findField('DPAGE').setValue(record.data.DPAGE);
+                        parentWin.formEdit.getForm().findField('DLABEL').setValue(record.data.DLABEL);
+                        parentWin.formEdit.getForm().findField('LINKMAN').setValue(record.data.LINKMAN);
+
+                    }
+                    window.closeAction = 'destroy';
+                    window.close();
 
                 },
                 scope: this
@@ -762,7 +745,7 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
 
 
     LoadData: function () {
-        this.opStatus == 'add';
+        this.opStatus = 'add';
 
         this.formEdit.getForm().reset();
         this.formEdit.getForm().setValues(this.MainEditRecord.data);
@@ -776,8 +759,11 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
         if (!basicForm.isValid()) {
             return;
         }
-
-
+        var TEMPLATE = this.formEdit.getForm().findField('TEMPLATE').getValue();
+        if (TEMPLATE == '') {
+            Ext.Msg.show({ title: '提示', msg: '模板名称不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+            return;
+        }
 
         basicForm.findField('GID').setDisabled(false);
         var data = basicForm.getValues();
@@ -915,9 +901,6 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
         var CUSTOMERNAME = form.findField('CUSTOMERNAME').getValue();
         sql = sql + getAndConSql(sql, CUSTOMERNAME, "B.CUSTOMERNAME='" + CUSTOMERNAME + "'");
 
-        var mblNo = form.findField('MblNo').getValue();
-        sql = sql + getAndConSql(sql, mblNo, " (MBLNO like '%" + mblNo + "%' or HBLNO like '%" + mblNo + "%' ) ");
-
         var TEMPLATE = form.findField('TEMPLATE').getValue();
         sql = sql + getAndConSql(sql, TEMPLATE, " (TEMPLATE like '%" + TEMPLATE + "%') ");
         
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleModel.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleModel.js
index d250fd76..21a51cd6 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleModel.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleModel.js
@@ -45,7 +45,7 @@
 		{ name: 'KINDPKGS', type: 'string' },
 		{ name: 'CBM', type: 'string' },
 		{ name: 'TOTALNO', type: 'string' },
-		{ name: 'REMARKS', type: 'string' },
+		{ name: 'REMARK', type: 'string' },
 		{ name: 'PLACERECEIPTID', type: 'string' },
         { name: 'COPYNOBILL', type: 'string' },
         { name: 'HSCODE', type: 'string' },
@@ -60,7 +60,6 @@
         { name: 'HUMIDITY', type: 'string' },
         { name: 'DPAGE', type: 'string' },
         { name: 'DLABEL', type: 'string' },
-        { name: 'LINKMAN', type: 'string' },
-        { name: 'PRINTSTATUS', type: 'string' }
+        { name: 'LINKMAN', type: 'string' }
     ]
 });
diff --git a/JobAutoCreateFee/JobGetMhData.cs b/JobAutoCreateFee/JobGetMhData.cs
index 738517dc..9a4b3736 100644
--- a/JobAutoCreateFee/JobGetMhData.cs
+++ b/JobAutoCreateFee/JobGetMhData.cs
@@ -417,8 +417,8 @@ namespace JobCreateFee
                                         cmdUpdateD6.Parameters.AddWithValue("@KGS", kgs);
                                         cmdUpdateD6.Parameters.AddWithValue("@CBM", cbm);
                                         cmdUpdateD6.Parameters.AddWithValue("@HarmonizedCode", HarmonizedCode);
-                                        cmdUpdateD6.Parameters.AddWithValue("@PackageType", PackageType);
-                                        cmdUpdateD6.Parameters.AddWithValue("@PKGSKIND", pkgs.ToString() + PackageType);
+                                        cmdUpdateD6.Parameters.AddWithValue("@PackageType", "PACKAGE");
+                                        cmdUpdateD6.Parameters.AddWithValue("@PKGSKIND", pkgs.ToString() + "PACKAGES");
                                         cmdUpdateD6.Parameters.AddWithValue("@GOODKGS", kgs.ToString() + "KGS");
                                         cmdUpdateD6.Parameters.AddWithValue("@GOODCBM", cbm.ToString() + "CBM");
                                         cmdUpdateD6.Parameters.AddWithValue("@CTNSTR", ctnstr);