diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user
index a48b3371..28be9c4c 100644
--- a/BookingJieFeng/BookingJieFeng.csproj.user
+++ b/BookingJieFeng/BookingJieFeng.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user
index 6bc24ada..4edb5e0f 100644
--- a/BookingWeb/BookingWeb.csproj.user
+++ b/BookingWeb/BookingWeb.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpAire/MsOpAireDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpAire/MsOpAireDAL.cs
index bd4ad375..78f58c20 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpAire/MsOpAireDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpAire/MsOpAireDAL.cs
@@ -91,7 +91,27 @@ namespace DSWeb.MvcShipping.DAL.MsOpAireDAL
             var sortstring = DatasetSort.Getsortstring(sort);
             if (!string.IsNullOrEmpty(sortstring))
             {
-                strSql.Append(" order by " + sortstring);
+                if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=B.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)"));
+                else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(B.BSNO) "));
+                else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("CRFEESTATUS", " dbo.F_GetBillCrFeeStatus(B.BSNO) "));
+                else if (sortstring.ToUpper().IndexOf("BSSTATUSREF") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("BSSTATUSREF", " BSSTATUS "));
+                else if (sortstring.ToUpper().IndexOf("FEESTATUSREF") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("FEESTATUSREF", " FEESTATUS "));
+                else if (sortstring.ToUpper().IndexOf("AMEND") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("AMEND", " CASE WHEN (SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID=B.BSNO)>0 THEN 1 ELSE 0 END "));
+                else if (sortstring.ToUpper().IndexOf("DRINVSTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRINVSTATUS", " CASE WHEN ISNULL(I.TTLINVDR,0)=0 THEN '未开票' ELSE CASE WHEN ISNULL(I.TTLINVDR,0)=ISNULL(I.TTLDR,0) THEN '已开票' ELSE '部分开票' END END "));
+                else if (sortstring.ToUpper().IndexOf("DRDUISTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRDUISTATUS", " CASE WHEN ISNULL(I.TTLDUIDR,0)=0 THEN '未对账' ELSE CASE WHEN ISNULL(I.TTLDUIDR,0)=ISNULL(I.TTLDR,0) THEN '已对账' ELSE '部分对账' END END "));
+                else
+                {
+                    sortstring = sortstring.Replace("SALECORP", "B.SALECORPID");
+                    strSql.Append(" order by " + sortstring);
+                }
             }
             else
             {
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
index 3be95511..c301519c 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
@@ -52,8 +52,31 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
             var sortstring = DatasetSort.Getsortstring(sort);
             if (!string.IsNullOrEmpty(sortstring))
             {
-                sortstring = sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)");
-                strSql.Append(" order by " + sortstring);
+                if (sortstring.ToUpper().IndexOf("OPSTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)"));
+                else if (sortstring.ToUpper().IndexOf("DRFEESTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRFEESTATUS", " dbo.F_GetBillDrFeeStatus(OP_APPLY.BSNO) "));
+                else if (sortstring.ToUpper().IndexOf("CRFEESTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("CRFEESTATUS", " dbo.F_GetBillCrFeeStatus(OP_APPLY.BSNO) "));
+                else if (sortstring.ToUpper().IndexOf("BSSTATUSREF") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("BSSTATUSREF", " BSSTATUS "));
+                else if (sortstring.ToUpper().IndexOf("FEESTATUSREF") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("FEESTATUSREF", " FEESTATUS "));
+                else if (sortstring.ToUpper().IndexOf("AMEND") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("AMEND", " CASE WHEN (SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID=OP_APPLY.BSNO)>0 THEN 1 ELSE 0 END "));
+                else if (sortstring.ToUpper().IndexOf("DRINVSTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRINVSTATUS", " CASE WHEN ISNULL(I.TTLINVDR,0)=0 THEN '未开票' ELSE CASE WHEN ISNULL(I.TTLINVDR,0)=ISNULL(I.TTLDR,0) THEN '已开票' ELSE '部分开票' END END "));
+                else if (sortstring.ToUpper().IndexOf("DRDUISTATUS") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("DRDUISTATUS", " CASE WHEN ISNULL(I.TTLDUIDR,0)=0 THEN '未对账' ELSE CASE WHEN ISNULL(I.TTLDUIDR,0)=ISNULL(I.TTLDR,0) THEN '已对账' ELSE '部分对账' END END "));
+                else if (sortstring.ToUpper().IndexOf("BSCUSTNO") >= 0)
+                    strSql.Append(" order by " + sortstring.Replace("BSCUSTNO", " (select TOP 1 CUSTNO from v_op_bs_no where BSNO=OP_APPLY.MASTERNO) "));
+                else
+                {
+
+                    sortstring = sortstring.Replace("OPSTATUS", "(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC)");
+                    strSql.Append(" order by " + sortstring);
+                }
+
             }
             else
             {
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
index 9892efec..15def369 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
+++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
@@ -8819,6 +8819,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
 
                     data.MBLNO = Convert.ToString(reader["MBLNO"]);//主提单号
                     data.HBLNO = Convert.ToString(reader["HBLNO"]);//分提单号
+                    data.CNTRTOTAL = Convert.ToString(reader["CNTRTOTAL"]);//集装箱
 
                     data.CNTRSEALNO = Convert.ToString(reader["CNTRSEALNO"]);//分提单号
 
diff --git a/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs b/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
index 2e1e985e..64391bde 100644
--- a/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
+++ b/DSWeb/Areas/MvcShipping/Models/MsOpSeae/MsOpSeae.cs
@@ -4038,6 +4038,8 @@ namespace DSWeb.MvcShipping.Models.MsOpSeae
 
         public string SALE { get; set; }
 
+        public string CNTRTOTAL { get; set; }
+
         public List<DSWeb.MvcShipping.Models.MsChFee.MsChFee> CHFEELIST {get;set;}
 
         #endregion
diff --git a/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx b/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
index 9e95a7a8..a01d27b5 100644
--- a/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
+++ b/DSWeb/Areas/MvcShipping/Views/MsOpAire/EditView.aspx
@@ -65,6 +65,50 @@
 <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">
+    Ext.Ajax.request({
+        waitMsg: '',
+        url: '/MvcShipping/MsSysParamSet/GetData',
+        params: {
+            condition: "PARAMNAME='FEELR'"
+        },
+        callback: function (options, success, response) {
+            if (success) {
+                var result = Ext.JSON.decode(response.responseText);
+                if (result.Success != true) {
+                    var head = document.getElementsByTagName('head')[0];
+                    var script = document.createElement('script');
+                    script.src = '../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js';
+                    script.type = 'text/javascript';
+                    head.appendChild(script);
+                } else {
+                    var data = result.data;
+                    if (data.PARAMVALUE == '1') {
+                        var head = document.getElementsByTagName('head')[0];
+                        var script = document.createElement('script');
+                        script.src = '../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridLR.js';
+                        script.type = 'text/javascript';
+                        head.appendChild(script);
+                    } else {
+                        var head = document.getElementsByTagName('head')[0];
+                        var script = document.createElement('script');
+                        script.src = '../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js';
+                        script.type = 'text/javascript';
+                        head.appendChild(script);
+                    }
+
+                }
+            } else {
+                var head = document.getElementsByTagName('head')[0];
+                var script = document.createElement('script');
+                script.src = '../../../../Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js';
+                script.type = 'text/javascript';
+                head.appendChild(script);
+            }
+        },
+        scope: this
+    });
+</script>
     <script type="text/javascript"">
 
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeOpStatus/MsCodeOpStatusEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeOpStatus/MsCodeOpStatusEdit.js
index 86950ec8..80f9deef 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeOpStatus/MsCodeOpStatusEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCodeOpStatus/MsCodeOpStatusEdit.js
@@ -48,7 +48,8 @@ Ext.extend(Shipping.MsCodeOpStatusEdit, Ext.Panel, {
             store: this.storeAddDCType,
             valueField: 'DC',
             displayField: 'NAME',
-            allowBlank: false, forceSelection: true,
+            allowBlank: false,
+            forceSelection: true,
             name: 'STTYPE',
             value: '1'
         });   
@@ -85,7 +86,7 @@ Ext.extend(Shipping.MsCodeOpStatusEdit, Ext.Panel, {
             valueField: 'id',
             displayField: 'name',
             allowBlank: false,
-            forceSelection: true,
+/*            forceSelection: true,*/
             name: 'COLOR'
         });     
 
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js
index ea7b4f41..aaa753d0 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptSaleBalProfitShare/MsRptSaleMHProfitShareIndex.js
@@ -539,10 +539,10 @@ Ext.extend(Shipping.MsRptSaleBalProfitShareIndex, Ext.Panel, {
             var openType = "_blank";
             var openUrl = "";
             if (record.data.OPLBNAME == "报关业务") {
-                openUrl = "../MvcShipping/MsOpApply/ApplyFeeView?handle=check&bsno=" + record.data.BSNO;
+                openUrl = "../../MvcShipping/MsOpApply/ApplyFeeView?handle=check&bsno=" + record.data.BSNO;
             } else {
 
-                openUrl = "../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.BSNO;
+                openUrl = "../../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.BSNO;
 
             }
             window.open(openUrl, openType, openSet);
diff --git a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
index d5266b5b..ef039f9d 100644
--- a/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
+++ b/DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
@@ -498,6 +498,89 @@ namespace DSWeb.Areas.TruckMng.Controllers
             return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
 
 
+        }
+
+
+        public ContentResult CreateHYRDFen(string bsno, string ctnbody)
+        {
+
+            var headData = MsRptPcHeadEditDAL.GetWFSDData("GID='" + bsno + "'");
+            var bodyctnData = JsonConvert.Deserialize<List<MsOpSeaeDetail>>(ctnbody);
+            var Fenlist = MsRptPcHeadEditDAL.GetWFSDFenList("t.PGID='" + headData.gId + "' AND t.GID<>'" + headData.gId + "'", null);
+            if (Fenlist!=null&& Fenlist.Count!=0)
+            {
+                var jsonRespose2 = new JsonResponse { Success = false, Message = "已生成分票,不允许引入生成！" };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
+
+            }
+            if (bodyctnData == null|| bodyctnData.Count == 0)
+            {
+                var jsonRespose2 = new JsonResponse { Success = false, Message = "不存在要生成分票的数据！" };
+                return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
+            }
+            var PGID = headData.gId;
+            DBResult result = new DBResult();
+            foreach (var ctn in bodyctnData) {
+
+                var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='陆运'", Convert.ToString(Session["COMPANYID"]));
+                billnoset.BILLTYPE = "0111";
+                billnoset.RULEDATETYPE = "业务日期";
+                var bsdate = headData.ExpDate;
+                if (bsdate == "" || bsdate == null)
+                    bsdate = DateTime.Now.ToString("yyyy-MM-dd");
+
+                headData.BillNo = MsSysBillNoSetDAL.GetBillNo(billnoset, bsdate, DateTime.Now.ToString("yyyy-MM")); //获取合同号
+
+                headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request);
+
+                headData.DbOperationType = DbOperationType.DbotIns;
+                headData.TRANSSTATUS = "新建";
+                headData.gId = "PC" + Guid.NewGuid().ToString("N").ToUpper();
+                headData.PGid = headData.gId;
+                headData.SealNo = ctn.SEALNO;
+                headData.ContainerNo = ctn.CNTRNO;
+
+
+
+
+                if (!string.IsNullOrEmpty(headData.LrDate))
+                {
+                    headData.LrDate = headData.LrDate.Substring(0, 10);
+                }
+                else
+                {
+                    var currentTime = System.DateTime.Now;
+                    headData.LrDate = currentTime.ToString("d");
+                }
+
+                var BSNO = headData.gId;
+
+                var modb = new ModelObjectDB();
+                result = modb.Save(headData);
+
+
+            }
+
+
+            if (result.Success)
+            {
+                result.Message = "生成成功！";
+
+            }
+            else
+            {
+                result.Message = "生成失败";
+
+            }
+
+            var jsonRespose = new JsonResponse
+            {
+                Success = result.Success,
+                Message = result.Message
+            };
+            return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
+
+
         }
 
         public ContentResult SaveQDLH(string opstatus, string data, string ctnbody)
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
index 67d4ab8d..12040ce6 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
@@ -290,7 +290,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             pageSize: this.PageSize,
             model: 'PCmb',
             remoteSort: true,
-            groupField: 'GroupDate',
+/*            groupField: 'GroupDate',*/
             proxy: {
                 type: 'ajax',
                 //url: '/TruckMng/MsRptPcHeadOperate/QryData_ADL',
@@ -364,7 +364,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             }, {
                 sortable: true,
                 dataIndex: 'PCSTATUSREF',
-                header: '状态',
+                header: '业务锁定',
                 width: 50,
                 renderer: function (value) {
                     if (value == "接单") {
@@ -407,8 +407,8 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 width: 80
             },
             {
-                sortable: true, hidden: true,
-                dataIndex: 'FEESTATUS',
+                sortable: true,
+                dataIndex: 'FEESTATUSREF',
                 header: '费用锁定',
                 width: 80
             },
@@ -485,13 +485,13 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 },
                 filter: true
             },
-            {
-                sortable: true,
-                dataIndex: 'RowNumber',
-                header: '日序号',
-                width: 60,
-                align: 'center'
-            },
+            //{
+            //    sortable: true,
+            //    dataIndex: 'RowNumber',
+            //    header: '日序号',
+            //    width: 60,
+            //    align: 'center'
+            //},
             {
                 sortable: true,
                 dataIndex: 'BillNo',
@@ -501,7 +501,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'MblNoSe',
-                header: '提单号',
+                header: '主提单号',
                 width: 160
                 //                ,
                 //                editor: {
@@ -509,6 +509,158 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 //                    selectOnFocus: true
                 //                }
             },
+            {
+                sortable: true,
+                dataIndex: 'CustomerName',
+                header: '委托单位',
+                width: 80
+                //                ,
+                //                editor: this.comboxCustomerName
+            },
+            {
+                sortable: true,
+                dataIndex: 'ACCDATE',
+                header: '会计期间',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'SalesName',
+                header: '揽货人',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DdName',
+                header: '客服',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'LinkManSe',
+                header: '单证',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardName',
+                header: '场站',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'CargoID',
+                header: '货物标识',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DUNNO',
+                header: 'UN',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DCLASS',
+                header: '主危',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardCodeSe',
+                header: '副危',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardNameSe',
+                header: '闪点',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISSHUISHI',
+                header: '怕水湿',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISGAOWEN',
+                header: '怕高温',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISXIANLIANG',
+                header: '只限量',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISCHECHUAN',
+                header: '车船',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISHAIWU',
+                header: '海污',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISFENGXIANG',
+                header: '封箱',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISWEISHENBAO',
+                header: '危申报',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISBAOGUAN',
+                header: '报关',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DispatchName',
+                header: '绑定',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISPINGTAI',
+                header: '平台空箱',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'BsType',
+                header: '业务类型',
+                width: 110
+            },
+            {
+                sortable: true,
+                dataIndex: 'TruckNo',
+                header: '空箱车号',
+                width: 80
+            },
+            {
+                sortable: true,
+                dataIndex: 'LoadFactory',
+                header: '工厂名称',
+                width: 80
+            },
+            {
+                sortable: true,
+                dataIndex: 'FactoryAddrSe',
+                header: '工厂地址',
+                width: 80
+            },
             {
                 sortable: true,
                 dataIndex: 'ArriveDate',
@@ -540,126 +692,75 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             },
             {
                 sortable: true,
-                dataIndex: 'CustomerName',
-                header: '委托单位',
-                width: 80
-                //                ,
-                //                editor: this.comboxCustomerName
+                dataIndex: 'RtnDocStatus',
+                header: '集港单',
+                width: 120
+
             },
             {
                 sortable: true,
-                dataIndex: 'F_CustomerName',
-                header: '车队',
-                width: 80
-                //                ,
-                //                editor: this.comboxTRUCKER
+                dataIndex: 'FrTruckNo',
+                header: '外点车号',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'TruckNo',
-                header: '车号',
-                width: 80
-                //                ,
-                //                editor: this.comboxTruckNo
+                dataIndex: 'FrDrvName',
+                header: '外点司机',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'BsType',
-                header: '业务类型',
-                width: 110
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
+                dataIndex: 'WmsTruckNo',
+                header: '入库车号',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'DstArea',
-                header: '到达地',
+                dataIndex: 'WmsDrvName',
+                header: '入库司机',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'FactoryAddr',
-                header: '卸货工厂',
+                dataIndex: 'DstAreaSe',
+                header: '空箱要求',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'DetiNation',
-                header: '目的地址',
+                dataIndex: 'DetiNationSe',
+                header: '派车要求',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'RtnDocStatus',
-                header: '回单状态',
-                width: 120,
-                //                editor: this.comboxBLTYPE,
-                renderer: function (value) {
-                    if (value == "1") {
-                        return "已回单";
-                    } else if (value == "0") {
-                        return "部分回单";
-                    } else {
-                        return "未回单";
-                    };
-                }
-
+                dataIndex: 'ContainerTypeSe',
+                header: '入库要求',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'RtnDocTime',
-                header: '回单时间',
-                width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
+                dataIndex: 'ContainerQty',
+                header: '箱量',
+                width: 80
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerQty',
-                header: '件数',
+                dataIndex: 'ContainerNo',
+                header: '箱号',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'numberfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'Ton',
-                header: '重量',
+                dataIndex: 'SealNo',
+                header: '封号',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'numberfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'LoadCount',
-                header: '体积',
+                dataIndex: 'ContainerNoSe',
+                header: '件重尺',
                 width: 80
                 //                ,
                 //                editor: {
@@ -672,38 +773,29 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 dataIndex: 'LoadPlace',
                 header: '装货地址',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
                 dataIndex: 'VoyVegSe',
-                header: '船名航次',
+                header: '中文船名',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerType',
-                header: '箱型',
+                dataIndex: 'EtDateSe',
+                header: '航次',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerQty',
-                header: '箱量',
+                dataIndex: 'VoyVeg',
+                header: '英文船名',
+                width: 110
+            },
+            {
+                sortable: true,
+                dataIndex: 'ContainerType',
+                header: '箱型',
                 width: 80
                 //                ,
                 //                editor: {
@@ -733,28 +825,6 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 //                    selectOnFocus: true
                 //                }
             },
-            {
-                sortable: true,
-                dataIndex: 'KINDPKGS',
-                header: '包装',
-                width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
-            },
-            {
-                sortable: true,
-                dataIndex: 'FactoryAddrSe',
-                header: '工厂地址',
-                width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
-            },
  
             {
                 sortable: true,
@@ -779,12 +849,6 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 header: '录入日期',
                 width: 110
             },
-            {
-                sortable: true,
-                dataIndex: 'VoyVeg',
-                header: '船名航次',
-                width: 110
-            },
             {
                 sortable: true, hidden: true,
                 dataIndex: 'RefBillNo',
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
index 267f7d2e..317e8c49 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
@@ -289,7 +289,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             pageSize: this.PageSize,
             model: 'PCmb',
             remoteSort: true,
-            groupField: 'GroupDate',
+/*            groupField: 'GroupDate',*/
             proxy: {
                 type: 'ajax',
                 //url: '/TruckMng/MsRptPcHeadOperate/QryData_ADL',
@@ -321,12 +321,12 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         });
 
         this.column = [
-        {
-            sortable: true, hidden: true,
-            dataIndex: 'PcBillType',
-            header: 'PcBillType',
-            width: 80
-        },
+            {
+                sortable: true, hidden: true,
+                dataIndex: 'PcBillType',
+                header: 'PcBillType',
+                width: 80
+            },
             {
                 sortable: true,
                 dataIndex: 'ExpDate',
@@ -363,7 +363,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             }, {
                 sortable: true,
                 dataIndex: 'PCSTATUSREF',
-                header: '状态',
+                header: '业务锁定',
                 width: 50,
                 renderer: function (value) {
                     if (value == "接单") {
@@ -406,70 +406,70 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 width: 80
             },
             {
-                sortable: true, hidden: true,
-                dataIndex: 'FEESTATUS',
+                sortable: true,
+                dataIndex: 'FEESTATUSREF',
                 header: '费用锁定',
                 width: 80
             },
-        {
-            sortable: true,
-            id: '',
-            dataIndex: 'DRFEESTATUS',
-            header: '应收费用', //'应收费用',
-            align: 'center',
-            width: 60,
-            renderer: function (value, meta) {
-
-                if (value == '审核通过') {
-                    meta.tdCls = 'feestatus_pass';
-                } else if (value == '录入状态') {
-
-                } else if (value == '提交审核') {
-                    meta.tdCls = 'feestatus_refer';
-                } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_refer';
-                } else if (value == '结算完毕') {
-                    meta.tdCls = 'feestatus_settle';
-                } else if (value == '未录入') {
-                } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_settle';
-                } else if (value == '部分审核') {
-                    meta.tdCls = 'feestatus_pass';
-                } else if (value == '部分提交') {
-                    meta.tdCls = 'feestatus_refer';
+            {
+                sortable: true,
+                id: '',
+                dataIndex: 'DRFEESTATUS',
+                header: '应收费用', //'应收费用',
+                align: 'center',
+                width: 60,
+                renderer: function (value, meta) {
+
+                    if (value == '审核通过') {
+                        meta.tdCls = 'feestatus_pass';
+                    } else if (value == '录入状态') {
+
+                    } else if (value == '提交审核') {
+                        meta.tdCls = 'feestatus_refer';
+                    } else if (value == '部分结算') {
+                        meta.tdCls = 'feestatus_refer';
+                    } else if (value == '结算完毕') {
+                        meta.tdCls = 'feestatus_settle';
+                    } else if (value == '未录入') {
+                    } else if (value == '部分结算') {
+                        meta.tdCls = 'feestatus_settle';
+                    } else if (value == '部分审核') {
+                        meta.tdCls = 'feestatus_pass';
+                    } else if (value == '部分提交') {
+                        meta.tdCls = 'feestatus_refer';
+                    }
+                    return value;
                 }
-                return value;
-            }
-        },
-        {
-            sortable: true,
-            id: '',
-            dataIndex: 'CRFEESTATUS',
-            header: '应付费用', //'应付费用',
-            align: 'center',
-            width: 60,
-            renderer: function (value, meta) {
-
-                if (value == '审核通过') {
-                    meta.tdCls = 'feestatus_pass';
-                } else if (value == '录入状态') {
-
-                } else if (value == '提交审核') {
-                    meta.tdCls = 'feestatus_refer';
-                } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_refer';
-                } else if (value == '结算完毕') {
-                    meta.tdCls = 'feestatus_settle';
-                } else if (value == '未录入') {
-                } else if (value == '部分结算') {
-                    meta.tdCls = 'feestatus_settle';
-                } else if (value == '部分审核') {
-                    meta.tdCls = 'feestatus_pass';
-                } else if (value == '部分提交') {
-                    meta.tdCls = 'feestatus_refer';
+            },
+            {
+                sortable: true,
+                id: '',
+                dataIndex: 'CRFEESTATUS',
+                header: '应付费用', //'应付费用',
+                align: 'center',
+                width: 60,
+                renderer: function (value, meta) {
+
+                    if (value == '审核通过') {
+                        meta.tdCls = 'feestatus_pass';
+                    } else if (value == '录入状态') {
+
+                    } else if (value == '提交审核') {
+                        meta.tdCls = 'feestatus_refer';
+                    } else if (value == '部分结算') {
+                        meta.tdCls = 'feestatus_refer';
+                    } else if (value == '结算完毕') {
+                        meta.tdCls = 'feestatus_settle';
+                    } else if (value == '未录入') {
+                    } else if (value == '部分结算') {
+                        meta.tdCls = 'feestatus_settle';
+                    } else if (value == '部分审核') {
+                        meta.tdCls = 'feestatus_pass';
+                    } else if (value == '部分提交') {
+                        meta.tdCls = 'feestatus_refer';
+                    }
+                    return value;
                 }
-                return value;
-            }
             },
             {
                 sortable: true,
@@ -484,13 +484,13 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 },
                 filter: true
             },
-            {
-                sortable: true,
-                dataIndex: 'RowNumber',
-                header: '日序号',
-                width: 60,
-                align: 'center'
-            },
+            //{
+            //    sortable: true,
+            //    dataIndex: 'RowNumber',
+            //    header: '日序号',
+            //    width: 60,
+            //    align: 'center'
+            //},
             {
                 sortable: true,
                 dataIndex: 'BillNo',
@@ -500,7 +500,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             {
                 sortable: true,
                 dataIndex: 'MblNoSe',
-                header: '提单号',
+                header: '主提单号',
                 width: 160
                 //                ,
                 //                editor: {
@@ -508,10 +508,168 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 //                    selectOnFocus: true
                 //                }
             },
+            {
+                sortable: true,
+                dataIndex: 'CustomerName',
+                header: '委托单位',
+                width: 80
+                //                ,
+                //                editor: this.comboxCustomerName
+            },
+            {
+                sortable: true,
+                dataIndex: 'ACCDATE',
+                header: '会计期间',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'SalesName',
+                header: '揽货人',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DdName',
+                header: '客服',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'LinkManSe',
+                header: '单证',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardName',
+                header: '场站',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'CargoID',
+                header: '货物标识',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DUNNO',
+                header: 'UN',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DCLASS',
+                header: '主危',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardCodeSe',
+                header: '副危',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'YardNameSe',
+                header: '闪点',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISSHUISHI',
+                header: '怕水湿',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISGAOWEN',
+                header: '怕高温',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISXIANLIANG',
+                header: '只限量',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISCHECHUAN',
+                header: '车船',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISHAIWU',
+                header: '海污',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISFENGXIANG',
+                header: '封箱',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISWEISHENBAO',
+                header: '危申报',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISBAOGUAN',
+                header: '报关',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'DispatchName',
+                header: '绑定',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'ISPINGTAI',
+                header: '平台空箱',
+                width: 160
+            },
+            {
+                sortable: true,
+                dataIndex: 'BsType',
+                header: '业务类型',
+                width: 110
+            },
+            {
+                sortable: true,
+                dataIndex: 'ReturnDate',
+                header: '空箱时间',
+                width: 80
+            },
+            {
+                sortable: true,
+                dataIndex: 'TruckNo',
+                header: '空箱车号',
+                width: 80
+            },
+            {
+                sortable: true,
+                dataIndex: 'LoadFactory',
+                header: '工厂名称',
+                width: 80
+            },
+            {
+                sortable: true,
+                dataIndex: 'FactoryAddrSe',
+                header: '装箱地点',
+                width: 80
+            },
             {
                 sortable: true,
                 dataIndex: 'ArriveDate',
-                header: '派车日期',
+                header: '装箱时间',
                 width: 80
             },
             {
@@ -539,126 +697,69 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
             },
             {
                 sortable: true,
-                dataIndex: 'CustomerName',
-                header: '委托单位',
-                width: 80
-                //                ,
-                //                editor: this.comboxCustomerName
-            },
-            {
-                sortable: true,
-                dataIndex: 'F_CustomerName',
-                header: '车队',
-                width: 80
-                //                ,
-                //                editor: this.comboxTRUCKER
+                dataIndex: 'RtnDocStatus',
+                header: '集港单',
+                width: 120
+
             },
             {
                 sortable: true,
-                dataIndex: 'TruckNo',
-                header: '车号',
-                width: 80
-                //                ,
-                //                editor: this.comboxTruckNo
+                dataIndex: 'RtnDocTime',
+                header: '入库时间',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'BsType',
-                header: '业务类型',
-                width: 110
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
+                dataIndex: 'WmsTruckNo',
+                header: '入库车号',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'DstArea',
-                header: '到达地',
+                dataIndex: 'WmsDrvName',
+                header: '入库司机',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'FactoryAddr',
-                header: '卸货工厂',
+                dataIndex: 'DstAreaSe',
+                header: '空箱要求',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'DetiNation',
-                header: '目的地址',
+                dataIndex: 'DetiNationSe',
+                header: '派车要求',
                 width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'RtnDocStatus',
-                header: '回单状态',
-                width: 120,
-                //                editor: this.comboxBLTYPE,
-                renderer: function (value) {
-                    if (value == "1") {
-                        return "已回单";
-                    } else if (value == "0") {
-                        return "部分回单";
-                    } else {
-                        return "未回单";
-                    };
-                }
-
+                dataIndex: 'ContainerTypeSe',
+                header: '入库要求',
+                width: 120
             },
             {
                 sortable: true,
-                dataIndex: 'RtnDocTime',
-                header: '回单时间',
-                width: 120
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
+                dataIndex: 'ContainerQty',
+                header: '箱量',
+                width: 80
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerQty',
-                header: '件数',
+                dataIndex: 'ContainerNo',
+                header: '箱号',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'numberfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'Ton',
-                header: '重量',
+                dataIndex: 'SealNo',
+                header: '封号',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'numberfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'LoadCount',
-                header: '体积',
+                dataIndex: 'ContainerNoSe',
+                header: '件重尺',
                 width: 80
                 //                ,
                 //                editor: {
@@ -671,38 +772,29 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 dataIndex: 'LoadPlace',
                 header: '装货地址',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
                 dataIndex: 'VoyVegSe',
-                header: '船名航次',
+                header: '中文船名',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerType',
-                header: '箱型',
+                dataIndex: 'EtDateSe',
+                header: '航次',
                 width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
             },
             {
                 sortable: true,
-                dataIndex: 'ContainerQty',
-                header: '箱量',
+                dataIndex: 'VoyVeg',
+                header: '英文船名',
+                width: 110
+            },
+            {
+                sortable: true,
+                dataIndex: 'ContainerType',
+                header: '箱型',
                 width: 80
                 //                ,
                 //                editor: {
@@ -732,29 +824,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 //                    selectOnFocus: true
                 //                }
             },
-            {
-                sortable: true,
-                dataIndex: 'KINDPKGS',
-                header: '包装',
-                width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
-            },
-            {
-                sortable: true,
-                dataIndex: 'FactoryAddrSe',
-                header: '工厂地址',
-                width: 80
-                //                ,
-                //                editor: {
-                //                    xtype: 'textfield',
-                //                    selectOnFocus: true
-                //                }
-            },
- 
+
             {
                 sortable: true,
                 dataIndex: 'Remark',
@@ -778,12 +848,6 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 header: '录入日期',
                 width: 110
             },
-            {
-                sortable: true,
-                dataIndex: 'VoyVeg',
-                header: '船名航次',
-                width: 110
-            },
             {
                 sortable: true, hidden: true,
                 dataIndex: 'RefBillNo',
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js
index fbeaf143..e50e74c3 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js
@@ -144,7 +144,70 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                 { name: 'SALE', type: 'string' }
             ]
         });
+        Ext.define('MsOpSeaeDetail', {
+            extend: 'Ext.data.Model',
+            fields: [
+                { name: 'GID', type: 'string' },
+                { name: 'CTN_ID', type: 'string' },
+                { name: 'MASTERNO', type: 'string' },
+                { name: 'BSNO', type: 'string' },
+                { name: 'sub_bno', type: 'string' },
+                { name: 'bno', type: 'string' },
+                { name: 'CTNCODE', type: 'string' },
+                { name: 'SIZE', type: 'string' },
+                { name: 'CTN', type: 'string' },
+                { name: 'CTNNUM', type: 'int' },
+                { name: 'TEU', type: 'int' },
+                { name: 'CTNALL', type: 'string' },
+                { name: 'CNTRNO', type: 'string' },
+                { name: 'SEALNO', type: 'string' },
+                { name: 'PKGS', type: 'int' },
+                { name: 'KGS', type: 'decimal' },
+                { name: 'CBM', type: 'decimal' },
+                { name: 'FENPKGS', type: 'int' },
+                { name: 'FENKGS', type: 'decimal' },
+                { name: 'FENCBM', type: 'decimal' },
+                { name: 'REMARK', type: 'string' },
+                { name: 'KINDPKGS', type: 'string' },
+                { name: 'TAREWEIGHT', type: 'decimal' }, //箱皮重
+                { name: 'TTLWEIGHT', type: 'decimal' }, //箱皮重
+                { name: 'GOODSNAME', type: 'string' }, //箱皮重
+                { name: 'EXITDOOR', type: 'string' }, //箱皮重
+                { name: 'ENTERDOOR', type: 'string' }, //箱皮重
+                { name: 'CTNSTATUS', type: 'string' }, //箱皮重
+                { name: 'MASTERNO', type: 'string' },
+                { name: 'VESSEL', type: 'string' }, //箱皮重
+                { name: 'VOYNO', type: 'string' }, //箱皮重
+                { name: 'MBLNO', type: 'string' }, //箱皮重
+                { name: 'TRUCKNO', type: 'string' }, //箱皮重
+                { name: 'TRUCKTYPE', type: 'string' }, //箱皮重
+                { name: 'ONBORD', type: 'string' }, //箱皮重
+                { name: 'ETD', type: 'string' },
+                { name: 'ISTEMP', type: 'string' },//暂出
+                { name: 'WEIGHTYPE', type: 'string' }, //称重方式
+                { name: 'WEIGHKGS', type: 'decimal' }, //称重重量
+                { name: 'WEIGHATTN', type: 'string' }, //Shipper VGM 联系人
+                { name: 'WEIGHTEL', type: 'string' }, //VGM联系人的联系方式
+                { name: 'WEIGHSIGN', type: 'string' }, ////VGM负责人签名
+                { name: 'WEIGHDATE', type: 'string' },  //VGM称重日期
+                { name: 'VGMADDR', type: 'string' }, ////VGM负责人签名
+                { name: 'VGMEMAIL', type: 'string' },  //VGM称重日期
+                { name: 'TIXIANGSHIJIAN', type: 'string' },//提箱时间
+                { name: 'TRUCKER', type: 'string' },
+                { name: 'TRUCKFEE', type: 'decimal' },
+                { name: 'FREESTORAGEDAY', type: 'int' },
+                { name: 'STORAGEDAY', type: 'int' },
+                { name: 'STORAGEPRICE', type: 'decimal' },
+                { name: 'STORAGEFEE', type: 'decimal' },
+                { name: 'FREECTNDAY', type: 'int' },
+                { name: 'CTNDAY', type: 'int' },
+                { name: 'CTNPRICE', type: 'decimal' },
+                { name: 'CTNFEE', type: 'decimal' },
+                { name: 'PCTN_ID', type: 'string' },
+                { name: 'VGMCONNCOM', type: 'string' }  //VGM联系公司
 
+            ]
+        });
 
         //#region 编辑Form
 
@@ -210,7 +273,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
         });
 
 
-
+        _thisPc = this;
 
         this.StoreTruckType = Ext.create('DsExt.ux.RefEnumStore', {});
         this.StoreTruckType.load({ params: { enumTypeId: 99019} });
@@ -260,19 +323,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
             ]
         });
 
-        //件数包装
-        this.storeCodePackage = Ext.create('DsExt.ux.RefTableStore', {
-            model: 'DsShipping.ux.CodePackageModel',
-            proxy: { url: '/CommMng/BasicDataRef/GetCodePackageList' }
-        });
-        this.storeCodePackage.load();
-        this.comboxKINDPKGS = Ext.create('DsExt.ux.RefTableCombox', {
-            fieldLabel: '包 装',
-            store: this.storeCodePackage,
-            name: 'KINDPKGS',
-            valueField: 'PKGS',
-            displayField: 'PKGS'
-        });
+
 
         Ext.define('MsWlBsHeadRefMsWlTruck', {
             extend: 'Ext.data.Model',
@@ -796,7 +847,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                         format: 'Y-m-d',
                         xtype: 'datefield',
                         name: 'ReturnDate'
-                    }, this.comboxTruckNo, this.comboxDrvName, , {
+                    }, this.comboxTruckNo, this.comboxDrvName,{
                             xtype: "checkbox",          //checkbox控件
                             name: "ISPINGTAI",
                               boxLabel: "",
@@ -925,6 +976,13 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                     },
                     scope: this
                 },
+                {
+                    text: "引入场站数据",
+                    handler: function (button, event) {
+                        this.onCreateFenClick();
+                    },
+                    scope: this
+                },
                 '-',
                 {
                     id: 'bsbtnCopyAndNew',
@@ -1397,6 +1455,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
 
                     var data = result.data;
 
+                    if (opstatus == 'add') {
+                        data.PcBillType = '';
+                    }
 
 
                     this.formEdit.getForm().reset();
@@ -2026,8 +2087,112 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
 
         DsTruck.MsChFeeAudit(records, 2, '正在提交审核数据, 请稍侯..');
     },
+    onCreateFenClick: function () {
 
 
+        Ext.Ajax.timeout = 6000000;
+
+        var YARD = this.formEdit.getForm().findField('YardName').getValue();
+        if (YARD == '' || YARD == NaN || YARD == null) {
+            Ext.Msg.show({ title: '警告', msg: '场站不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!'
+            return;
+        }
+        var MBLNO = this.formEdit.getForm().findField('MblNoSe').getValue();
+        if (MBLNO == '' || MBLNO == NaN || MBLNO == null) {
+            Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
+            return;
+        }
+
+        var BSNO = this.formEdit.getForm().findField('gId').getValue();
+        Ext.Msg.wait('正在提取数据, 请稍侯..');
+        var storeyardctn = Ext.create('Ext.data.Store', {
+            model: 'MsOpSeaeDetail',
+            remoteSort: true,
+            proxy: {
+                type: 'ajax',
+                timeout: 6000000,//60秒,
+                url: '/MvcShipping/MsOpSeae/GetyardctnList',
+                reader: {
+                    id: 'BSNO,CTNCODE,CTN_ID',
+                    root: 'data',
+                    totalProperty: 'totalCount'
+                }
+            }
+        });
+
+        storeyardctn.load({
+            params: { bs: BSNO, mblno: MBLNO, yard: YARD },
+            timeout: 6000000,//60秒,
+            callback: function (r, options, success) {
+                if (success) {
+                    var jsonresult = Ext.JSON.decode(options.response.responseText);
+                    if (storeyardctn.getCount() > 0) {
+                        var member = storeyardctn.getAt(0);
+                        var sVESSEL = "";
+                        var sVOYNO = "";
+                        var bodydatas = [];
+                        for (var j = 0; j < storeyardctn.getCount(); j += 1) {
+                            var member = storeyardctn.getAt(j);
+                            var WEIGHDATE = member.data.WEIGHDATE;
+                            if (WEIGHDATE != '')
+                                WEIGHDATE = Ext.util.Format.date(WEIGHDATE, 'Y-m-d');
+                            member.data.WEIGHDATE = WEIGHDATE;
+                            var TIXIANGSHIJIAN = member.data.TIXIANGSHIJIAN;
+                            if (TIXIANGSHIJIAN != '')
+                                TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d');
+                            member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN;
+                            if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0';
+
+                            bodydatas.push(member);
+                        };
+                        var jsonBody = ConvertRecordsToJsonAll(bodydatas);
+                        Ext.Msg.wait('正在保存数据, 请稍侯..');
+                        Ext.Ajax.request({
+                            waitMsg: '正在保存数据...',
+                            url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
+                            scope: this,
+                            params: {
+                                bsno: BSNO,
+                                ctnbody: jsonBody
+                            },
+                            callback: function (options, success, response) {
+                                if (success) {
+                                    Ext.MessageBox.hide();
+                                    var jsonresult = Ext.JSON.decode(response.responseText);
+                                    if (jsonresult.Success) {
+                                        Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                    } else {
+                                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                    }
+                                } else {
+                                    Ext.Msg.show({
+                                        title: '请重试',
+                                        msg: '服务器响应出错',
+                                        icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                                    });
+                                }
+                            }
+                        });
+                        //
+                        //
+
+                    } else {
+                        if (jsonresult.Success) {
+                            Ext.Msg.show({ title: '警告', msg: '没有提取的相关数据！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'没有提取的相关数据！'
+                        } else
+                            Ext.Msg.show({ title: '警告', msg: jsonresult.Message, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
+
+                    }
+                }
+                else {
+                    Ext.Msg.show({ title: '警告', msg: '服务器响应出错', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                }
+            },
+            scope: this
+        });
+
+    },
+
     onAddDetailClick: function (button, event, type) {
         if (this.modPcHeadEdit_GDFY == 0) {
             Ext.Msg.show({ title: '提示', msg: '没有权限修改费用', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });//当前费用已対帐无法修改!
diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js
index 7ee70ee7..1cfe93fe 100644
--- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js
+++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js
@@ -241,7 +241,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
             }
         });
 
-
+        _thisPc = this;
 
 
         this.StoreBLTYPE = Ext.create('Ext.data.Store', {
@@ -2633,7 +2633,113 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                 }
             }
         });
-    }, //end save  
+    }, //end save
+
+    onCreateFenClick: function () {
+
+
+        Ext.Ajax.timeout = 6000000;
+
+        var YARD = this.formEdit.getForm().findField('YardName').getValue();
+        if (YARD == '' || YARD == NaN || YARD == null) {
+            Ext.Msg.show({ title: '警告', msg: '场站不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!'
+            return;
+        }
+        var MBLNO = this.formEdit.getForm().findField('MblNoSe').getValue();
+        if (MBLNO == '' || MBLNO == NaN || MBLNO == null) {
+            Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
+            return;
+        }
+
+        var BSNO = this.formEdit.getForm().findField('gId').getValue();
+        Ext.Msg.wait('正在提取数据, 请稍侯..');
+        var storeyardctn = Ext.create('Ext.data.Store', {
+            model: 'MsOpSeaeDetail',
+            remoteSort: true,
+            proxy: {
+                type: 'ajax',
+                timeout: 6000000,//60秒,
+                url: '/MvcShipping/MsOpSeae/GetyardctnList',
+                reader: {
+                    id: 'BSNO,CTNCODE,CTN_ID',
+                    root: 'data',
+                    totalProperty: 'totalCount'
+                }
+            }
+        });
+
+        storeyardctn.load({
+            params: { bs: BSNO, mblno: MBLNO, yard: YARD },
+            timeout: 6000000,//60秒,
+            callback: function (r, options, success) {
+                if (success) {
+                    var jsonresult = Ext.JSON.decode(options.response.responseText);
+                    if (storeyardctn.getCount() > 0) {
+                        var member = storeyardctn.getAt(0);
+                        var sVESSEL = "";
+                        var sVOYNO = "";
+                        var bodydatas = [];
+                        for (var j = 0; j < storeyardctn.getCount(); j += 1) {
+                            var member = storeyardctn.getAt(j);
+                            var WEIGHDATE = member.data.WEIGHDATE;
+                            if (WEIGHDATE != '')
+                                WEIGHDATE = Ext.util.Format.date(WEIGHDATE, 'Y-m-d');
+                            member.data.WEIGHDATE = WEIGHDATE;
+                            var TIXIANGSHIJIAN = member.data.TIXIANGSHIJIAN;
+                            if (TIXIANGSHIJIAN != '')
+                                TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d');
+                            member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN;
+                            if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0';
+
+                            bodydatas.push(member);
+                        };
+                        var jsonBody = ConvertRecordsToJsonAll(bodydatas);
+                        Ext.Msg.wait('正在保存数据, 请稍侯..');
+                        Ext.Ajax.request({
+                            waitMsg: '正在保存数据...',
+                            url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
+                            scope: this,
+                            params: {
+                                bsno: BSNO,
+                                ctnbody: jsonBody
+                            },
+                            callback: function (options, success, response) {
+                                if (success) {
+                                    Ext.MessageBox.hide();
+                                    var jsonresult = Ext.JSON.decode(response.responseText);
+                                    if (jsonresult.Success) {
+                                        Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                    } else {
+                                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                    }
+                                } else {
+                                    Ext.Msg.show({
+                                        title: '请重试',
+                                        msg: '服务器响应出错',
+                                        icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                                    });
+                                }
+                            }
+                        });
+                        //
+                        //
+
+                    } else {
+                        if (jsonresult.Success) {
+                            Ext.Msg.show({ title: '警告', msg: '没有提取的相关数据！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'没有提取的相关数据！'
+                        } else
+                            Ext.Msg.show({ title: '警告', msg: jsonresult.Message, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
+
+                    }
+                }
+                else {
+                    Ext.Msg.show({ title: '警告', msg: '服务器响应出错', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                }
+            },
+            scope: this
+        });
+
+    },
 
     onAddCtnDetailClick: function () {
         //var newSerialno = DsGetNewSerialNo(this.storeBodyList, this.serialNo);
@@ -3085,6 +3191,51 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                             }
 
                         };
+
+                        var bodydatas = [];
+                        for (var j = 0; j < storeyardctn.getCount(); j += 1) {
+                            var member = storeyardctn.getAt(j);
+                            var WEIGHDATE = member.data.WEIGHDATE;
+                            if (WEIGHDATE != '')
+                                WEIGHDATE = Ext.util.Format.date(WEIGHDATE, 'Y-m-d');
+                            member.data.WEIGHDATE = WEIGHDATE;
+                            var TIXIANGSHIJIAN = member.data.TIXIANGSHIJIAN;
+                            if (TIXIANGSHIJIAN != '')
+                                TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d');
+                            member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN;
+                            if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0';
+
+                            bodydatas.push(member);
+                        };
+                        var jsonBody = ConvertRecordsToJsonAll(bodydatas);
+                        Ext.Msg.wait('正在保存数据, 请稍侯..');
+                        Ext.Ajax.request({
+                            waitMsg: '正在保存数据...',
+                            url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
+                            scope: this,
+                            params: {
+                                bsno: BSNO,
+                                ctnbody: jsonBody
+                            },
+                            callback: function (options, success, response) {
+                                if (success) {
+                                    Ext.MessageBox.hide();
+                                    var jsonresult = Ext.JSON.decode(response.responseText);
+                                    if (jsonresult.Success) {
+                                        Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
+                                    } else {
+                                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                                    }
+                                } else {
+                                    Ext.Msg.show({
+                                        title: '请重试',
+                                        msg: '服务器响应出错',
+                                        icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
+                                    });
+                                }
+                            }
+                        });
+
                         //
                         Ext.Msg.hide();
                         //
diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user
index e6a8406a..af17a67a 100644
--- a/DispatchWeb/DispatchWeb.csproj.user
+++ b/DispatchWeb/DispatchWeb.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />