错误提交单No.45990

BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj

@@ -122,15 +122,9 @@
     <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishBtnExt.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishEdit_Ext.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeEdit_Ext.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeReport_Ext.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\ProduceFinishEdit_Ext.cs" />
+    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeEdit_Ext.cs" />
+    <Compile Include="Pages\B3YunKen\Overlays\ProductNoticeReport_Ext.cs" />
     <Compile Include="Pages\B3YunKen\Overlays\ReturnApplicationEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -143,9 +137,7 @@
     <Compile Include="Pages\B3YunKen\Overlays\SaleOutStoreEdit_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs">
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
+    <Compile Include="Pages\B3YunKen\Overlays\SelectProductNoticeDialog_Ext.cs" />
     <Compile Include="Pages\B3YunKen\Overlays\VerificationPage_Ext.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>

BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/CustomerStopByTaskReport.cs

@@ -46,21 +46,6 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       mQueryContainer.GetControl<DFBoolComboBox>("Stopped").Value=true;
     }
 
-    protected override void CreateDFBrowseGridColumns(DFBrowseGrid grid)
-    {
-      base.CreateDFBrowseGridColumns(grid);
-      grid.DataFilter = delegate (DFDataTable tbl) {
-        foreach (DFDataRow row in tbl.Rows)
-        {
-          var val = (bool)row["是否停用"];
-          if (!val)
-          {
-            row["移动电话"] = "";
-          }
-        }
-      };
-    }
-
     protected override void AddQueryControls(VLayoutPanel vPanel)
     {
       var layout = new LayoutManager("Main", mDFInfo, mQueryContainer);
@@ -182,7 +167,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
               query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLinkName(bill)), field.Text));
               break;
             case "移动电话":
-              query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetLinkPhone(bill)), field.Text));
+              query.Columns.Add(DQSelectColumn.Create(DQExpression.LogicCase(DQCondition.EQ("Stopped", true), DQExpression.SubQuery(GetLinkPhone(bill)),DQExpression.Value(string.Empty)), field.Text));
               break;
             case "最后一次发货时间":
               query.Columns.Add(DQSelectColumn.Create(DQExpression.SubQuery(GetMaxLoadTime(bill)), field.Text));