1、需求单No.141696 羊定价单支持微信审批。

2、需求单No.141700 羊付款分析表 显示字段增加{开户银行}和{银行账号}字段

B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs

@@ -63,8 +63,10 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.PayAnalyse_
     {
       mDisplayHelper.AddOptionItem("单号", "bill", "ID", false);
       mDisplayHelper.AddOptionItem("会计单位", "bill", "AccountingUnit_Name", false);
-      mDisplayHelper.AddOptionItem("供应商", "bill", "Supplier_Name", false);
       mDisplayHelper.AddOptionItem("付款日期", "bill", "Date", false);
+      mDisplayHelper.AddOptionItem("供应商", "bill", "Supplier_Name", false);
+      mDisplayHelper.AddOptionItem("开户银行", "bill", "Supplier_Bank", false);
+      mDisplayHelper.AddOptionItem("银行账号", "bill", "Account_BankAccountNumber", false);
       mDisplayHelper.AddOptionItem("付款金额", "bill", "Money", false, true);
       mDisplayHelper.AddOptionItem("手续费", "detail", "ServiceFee", false, true);
       mDisplayHelper.AddOptionItem("扣费额金额", "detail", "SubServiceMoney", false, true);

B3SheepButcherManage/BL/Bill/FixedPriceBL/FixedPriceBL.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using TSingSoft.WebPluginFramework;
 
 namespace BWP.B3SheepButcherManage.BL
 {
@@ -20,6 +21,14 @@ namespace BWP.B3SheepButcherManage.BL
 
   public class FixedPriceBL : DepartmentWorkFlowBillBL<FixedPrice>, IFixedPriceBL
   {
+    protected override bool HasWorkFlowWeChatApproveFeature
+    {
+      get
+      {
+        return FeatureUtil.Enabled("B3SheepButcherManage.0006");
+      }
+    }
+
     public void RsetPrice(FixedPrice dmo)
     {
       var dom = new DmoQuery(typeof(StatPay));

B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs

@@ -316,18 +316,18 @@ namespace BWP.B3SheepButcherManage.BL
 
       dmo.RealNumber = 屠宰记录头数 + 急宰记录头数;//收购头数计算
 
-      var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2);
-      if (总磅后头数 + 已结算过磅单头数 == (dmo.WeighBill_BuyNum ?? 0))
-      {
+      //var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2);
+      //if (总磅后头数 + 已结算过磅单头数 == (dmo.WeighBill_BuyNum ?? 0))
+      //{
         //如果刚好等于过磅单的头数，则重量直接减掉，防止小数点
-        dmo.RealWeight = 榜前急宰重量 + (Math.Round((decimal)(dmo.WeighBill_BuyWeigh1 ?? 0), 2) - 已结算过磅单重量);//收购重量计算
-      }
-      else
-      {
-        var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum;
-        var 本次榜后结算重量 = Math.Round((总磅后头数 * 过磅单每头猪的重量 ?? 0), 2);
-        dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量;
-      }
+        dmo.RealWeight = Math.Round((decimal)(dmo.WeighBill_BuyWeigh1 ?? 0), 2);//收购重量计算
+      //}
+      //else
+      //{
+        //var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum;
+        //var 本次榜后结算重量 = Math.Round((总磅后头数 * 过磅单每头猪的重量 ?? 0), 2);
+       // dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量;
+      //}
       //更新到数据库
       UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight);
     }
@@ -435,7 +435,7 @@ namespace BWP.B3SheepButcherManage.BL
       var wid = InnerBLUtil.GetDmoPropertyByID<long?>(Session, typeof(StatPay), "WeightBill_ID", statPayID);
       if (wid.HasValue)
       {
-        var sql = string.Format("update d set d.StatPay_ID = null from B3SheepButcherManage_Butcher_Detail d left outer join B3SheepButcherManage_StatPay m on d.StatPay_ID=m.ID where d.WeightBill_ID={0} and m.ID is null and d.StatPay_ID is not null", wid);
+        var sql = string.Format("update d set d.StatPay_ID = null from B3SheepButcherManage_Butcher_Detail d left outer join B3SheepButcherManage_StatPay m on d.StatPay_ID=m.ID where d.WeightBill_ID={0} and m.ID ={1} and d.StatPay_ID is not null", wid, statPayID);
         Session.ExecuteSqlNonQuery(sql);
       }
       CancelAllDetails<Butcher_Detail>(statPayID);

WebFolder/config/Plugins/B3SheepButcherManage.Plugin

@@ -152,6 +152,7 @@
     <Feature id="0003" name="羊屠宰单"/>
     <Feature id="0004" name="羊结算单"/>
     <Feature id="0005" name="羊付款单"/>
+    <Feature id="0006" name="羊定价单微信审批"/>
   </Features>
 
 </Plugin>