1

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 />

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 />

DSWeb/Areas/TruckMng/DAL/MsRptPcHeadEdit/MsRptPcHeadEditDAL.cs

@@ -1680,7 +1680,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
             strSql.Append(" ,ROW_NUMBER()over (partition by dbo.trimdate(expdate) order by expdate ) RowNumber ");
             strSql.Append(" ,BillNo,dbo.trimtime(ExpDate) ExpDate, dbo.trimdate(expdate) GroupDate ,ArriveDate,ReturnDate ");
             strSql.Append(" ,CustomerName,F_CustomerName,t.DrvName,t.DdName,t.DrvCode,t.TruckNo,MblNo,LinkMan,DstArea,DetiNation,ContainerQty,GOODSCOUNT,CBM ");
-            strSql.Append(" ,Ton,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,EndPortDate,VoyVeg,VoyVegSe,EtDate ");
+            strSql.Append(" ,Ton,AroundTon,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,EndPortDate,VoyVeg,VoyVegSe,EtDate ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='运费' and FEETYPE=1)YUNFEI ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='回程合计' and FEETYPE=1)HCHJ ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='装卸费' and FEETYPE=1)ZXF ");
@@ -1781,7 +1781,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
             strSql.Append(" ,ROW_NUMBER()over (partition by dbo.trimdate(expdate) order by expdate ) RowNumber ");
             strSql.Append(" ,BillNo,dbo.trimtime(ExpDate) ExpDate, dbo.trimdate(expdate) GroupDate ,ArriveDate,ReturnDate ");
             strSql.Append(" ,CustomerName,F_CustomerName,t.DrvName,t.DdName,t.DrvCode,t.TruckNo,MblNo,LinkMan,DstArea,DetiNation,ContainerQty,GOODSCOUNT,CBM ");
-            strSql.Append(" ,Ton,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,dbo.trimtime(EndPortDate) EndPortDate,VoyVeg,VoyVegSe,dbo.trimtime(EtDate) EtDate ");
+            strSql.Append(" ,Ton,AroundTon,t.LoadCount,LoadPlace,TruckSpec,IsDouble,Property,RefBillNo,RefBillNose,MblNoSe,dbo.trimtime(EndPortDate) EndPortDate,VoyVeg,VoyVegSe,dbo.trimtime(EtDate) EtDate ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='运费' and FEETYPE=1)YUNFEI ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='回程合计' and FEETYPE=1)HCHJ ");
             strSql.Append(" ,(select sum(amount) from ch_Fee where bsno=t.gid and feename='装卸费' and FEETYPE=1)ZXF ");
@@ -1852,6 +1852,7 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
                     data.DetiNation = Convert.ToString(reader["DetiNation"]);
                     data.ContainerQty = Convert.ToString(reader["ContainerQty"]);
                     data.Ton = Convert.ToString(reader["Ton"]);
+                    data.AroundTon = Convert.ToString(reader["AroundTon"]);
                     data.GOODSCOUNT = Convert.ToString(reader["GOODSCOUNT"]);
                     data.CBM = Convert.ToString(reader["CBM"]);
                     data.LoadCount = Convert.ToString(reader["LoadCount"]);

DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs

@@ -1988,6 +1988,9 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
             get { return _Ton; }
             set { _Ton = value; }
         }
+        [ModelDB]
+        public string AroundTon { get; set; }
+
         [ModelDB]
         public string GOODSCOUNT
         {

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js

@@ -64,6 +64,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 { name: 'DetiNation', type: 'string' },
                 { name: 'ContainerQty', type: 'string' },
                 { name: 'Ton', type: 'string' },
+                { name: 'AroundTon', type: 'string' },
                 { name: 'LoadCount', type: 'string' },
                 { name: 'LoadPlace', type: 'string' },
                 { name: 'TruckSpec', type: 'string' },

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js

@@ -63,6 +63,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                 { name: 'DetiNation', type: 'string' },
                 { name: 'ContainerQty', type: 'string' },
                 { name: 'Ton', type: 'string' },
+                { name: 'AroundTon', type: 'string' },
                 { name: 'LoadCount', type: 'string' },
                 { name: 'LoadPlace', type: 'string' },
                 { name: 'TruckSpec', type: 'string' },
@@ -1386,9 +1387,9 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         this.storeRtnDocStatus.add({ "FSTATUS": "无装箱证明", "NAME": "无装箱证明" });
         this.storeRtnDocStatus.add({ "FSTATUS": "无转港", "NAME": "无转港" });
         this.storeRtnDocStatus.add({ "FSTATUS": "已办", "NAME": "已办" });
-        this.storeRtnDocStatus2.add({ "FSTATUS": "1", "NAME": "1" });
+        this.storeRtnDocStatus.add({ "FSTATUS": "1", "NAME": "1" });
-        this.storeRtnDocStatus2.add({ "FSTATUS": "缺附件", "NAME": "缺附件" });
+        this.storeRtnDocStatus.add({ "FSTATUS": "缺附件", "NAME": "缺附件" });
-        this.storeRtnDocStatus2.add({ "FSTATUS": "完结", "NAME": "完结" });
+        this.storeRtnDocStatus.add({ "FSTATUS": "完结", "NAME": "完结" });
 
         this.comboxRtnDocStatus = Ext.create('DsExt.ux.RefTableCombox', {
             fieldLabel: '集港单', //是否开垫付
@@ -1493,6 +1494,33 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         });
 
 
+        this.storeCreatePc = Ext.create('Ext.data.Store', {
+            fields: ['FSTATUS', 'NAME']
+        });
+        this.storeCreatePc.add({ "FSTATUS": "", "NAME": '全部' });
+        this.storeCreatePc.add({ "FSTATUS": "0", "NAME": '否' });
+        this.storeCreatePc.add({ "FSTATUS": "1", "NAME": '是' });
+
+        this.comboxCreatePc = Ext.create('DsExt.ux.RefTableCombox', {
+            fieldLabel: '生成派车',
+            store: this.storeCreatePc,
+            valueField: 'FSTATUS',
+            displayField: 'NAME',
+            forceSelection: true,
+            name: 'CREATEPC',
+
+            value: '',
+            enableKeyEvents: true,
+            listeners: {
+                keyup: function (field, e) {
+                    if (e.getKey() == e.ENTER) {
+                        _thisZXindex.onRefreshClick();
+                    }
+                }
+            }
+        });
+
+
         //#endregion
 
 
@@ -1623,7 +1651,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
                                         }
                                     }
                                 }
-                            }, this.comboxWmsStatus, this.comboxCtnStatus, {
+                            }, this.comboxWmsStatus, this.comboxCtnStatus, this.comboxCreatePc,{
                                 //xtype: 'button',
                                 width: 90,
                                 text: "高级查询",
@@ -3142,6 +3170,14 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
         var DdName = form.findField('DdName').getValue();
         sql = sql + getAndConSql(sql, DdName, " DdName='" + DdName + "' ");
 
+        var CREATEPC = form.findField('CREATEPC').getValue();
+        if (CREATEPC == '1') {
+            sql = sql + getAndConSql(sql, CREATEPC, " isnull(Property,'')<>'' ");
+        } else if (CREATEPC == '0') {
+            sql = sql + getAndConSql(sql, CREATEPC, " isnull(Property,'')='' ");
+        }
+        
+
         var ONLYMASTER = form.findField('ONLYMASTER').getValue();
 
         

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js

@@ -69,6 +69,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                 { name: 'DetiNation', type: 'string' },
                 { name: 'ContainerQty', type: 'string' },
                 { name: 'Ton', type: 'string' },
+                { name: 'AroundTon', type: 'string' },
                 { name: 'LoadCount', type: 'string' },
                 { name: 'LoadPlace', type: 'string' },
                 { name: 'TruckSpec', type: 'string' },
@@ -1025,6 +1026,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                         name: "ISPINGTAI",
                         boxLabel: "",
                         fieldLabel: "平台空箱",
+                        flex: 0.5,
                         inputValue: true,         //选中的值
                         uncheckedValue: false,     //未选中的值
                         checked: false             //绘制时的选中状态
@@ -1033,10 +1035,14 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                             flex: 0.5,
                             name: 'LoadCount'
                         }, {
-                            fieldLabel: '分成',
+                            fieldLabel: '外点分成',
                             flex: 0.5,
                             name: 'Ton'
                         }, {
+                        fieldLabel: '空箱分成',
+                            flex: 0.5,
+                        name: 'AroundTon'
+                        }, {
                         fieldLabel: '入库时间',
                             format: 'Y-m-d',
                             xtype: 'datefield',

DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js

@@ -70,6 +70,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                 { name: 'DetiNation', type: 'string' },
                 { name: 'ContainerQty', type: 'string' },
                 { name: 'Ton', type: 'string' },
+                { name: 'AroundTon', type: 'string' },
                 { name: 'LoadCount', type: 'string' },
                 { name: 'LoadPlace', type: 'string' },
                 { name: 'TruckSpec', type: 'string' },
@@ -1615,9 +1616,13 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
                             flex: 0.5,
                         name: 'LoadCount'
                         }, {
-                        fieldLabel: '分成',
+                        fieldLabel: '外点分成',
                             flex: 0.5,
                         name: 'Ton'
+                        }, {
+                            fieldLabel: '空箱分成',
+                            flex: 0.5,
+                        name: 'AroundTon'
                         }, {
                             fieldLabel: '装箱日期',
                             format: 'Y-m-d',

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 />