.

B3ButcherManageToSale.Web/Pages/B3ButcherManageToSale/Reports/SaleOutStockAnalyse_/SaleOutStockAnalyse.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web.UI;
+using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using TSingSoft.WebControls2;
 using TSingSoft.WebControls2.DFGrids;
@@ -44,6 +45,26 @@ namespace BWP.Web.Pages.B3ButcherManageToSale.Reports.SaleOutStockAnalyse_
       base.InitForm(form);
       mDFGrid.AllowRowGroup = true;
       mDFGrid.AllowColGroup = true;
+      mDFGrid.AfterFillDetailRow += (htmlRow, dataRow) =>
+      {
+        var row = (DFDataRow)dataRow;
+        var diff = row["备货差异|数量"];
+        if (diff != null && Convert.ToDecimal(diff) <= 0)
+        {
+          foreach (HtmlTableCell c in htmlRow.Cells)
+            c.Style.Add("background-color", "lightgreen");
+        }
+        else
+        {
+          var ava = row["可用|数量"];
+          if (ava != null && Convert.ToDecimal(diff ?? 0) == Convert.ToDecimal(ava))
+          {
+            var cIdx = onlyGoodsCheck.Checked ? 9 : 11;
+            htmlRow.Cells[cIdx].Style.Add("background-color", "lightgreen");
+          }
+        }
+
+      };
     }
 
     protected override void InitQueryPanel(WebControls.QueryPanel queryPanel)
@@ -126,18 +147,23 @@ namespace BWP.Web.Pages.B3ButcherManageToSale.Reports.SaleOutStockAnalyse_
         }
         else
         {
-          if (item.StockDiffNumber != 0)
+          if (item.StockDiffNumber > 0)
           {
             item.AvailableMain = Math.Min(item.StockDiffNumber.Value, (first.MainNumber ?? 0).Value);
 
             first.MainNumber -= item.AvailableMain;
+
+            if (item.AvailableMain < 0)
+              item.AvailableMain = 0;
+
             if (first.MainNumber < 0)
               first.MainNumber = 0;
           }
 
-          if (item.StockDiffSecondNumber != 0)
+          if (item.StockDiffSecondNumber > 0)
           {
             item.AvailableSecond = Math.Min(item.StockDiffSecondNumber.Value, (first.SecondNumber ?? 0).Value);
+
             first.SecondNumber -= item.AvailableSecond;
 
             if (item.AvailableSecond < 0)