需求单No.138390 屠宰场管理新增档案“收购类型” 把原有的NamedValue类型换成档案

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs

@@ -180,7 +180,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       config.Add("SupplierClass_ID");
       config.Add("Employee_ID");
       config.Add("ValuationArea_ID");
-      config.Add("PurchaseType");
+      config.Add("PurchaseType_ID");
       config.Add("Date");
       layoutManager.Config = config;
       vPanel.Add(layoutManager.CreateLayout());
@@ -195,7 +195,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
 
       _checkbox = new CheckBoxListWithReverseSelect { RepeatColumns = 6, RepeatDirection = RepeatDirection.Horizontal };
       _checkbox.Items.Add(new ListItem("收购日期", "WeighTime"));
-      _checkbox.Items.Add(new ListItem("收购类型", "PurchaseType"));
+      _checkbox.Items.Add(new ListItem("收购类型", "PurchaseType_Name"));
       _checkbox.Items.Add(new ListItem("供应商", "Supplier_Name"));
       _checkbox.Items.Add(new ListItem("来源地", "来源地"));
       _checkbox.Items.Add(new ListItem("过磅单号", "Weigh_ID"));

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml

@@ -48,8 +48,8 @@
       </EQ>
 
       <EQ>
-        <Field name="PurchaseType" alias="bill"/>
-        <QBE paramName="PurchaseType"/>
+        <Field name="PurchaseType_ID" alias="bill"/>
+        <QBE paramName="PurchaseType_ID"/>
       </EQ>
 
       <GreaterThanOrEqual>

B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs

@@ -41,7 +41,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
         return;
       }
 
-      if (dmo.PurchaseType == 收购类型.业务)
+      if (dmo.PurchaseType_Name == "业务")
       {
         dmo.ActualMoney = (dmo.ShackMoney.EToDecimal() ?? 0) + (dmo.JingJianFee.EToDecimal() ?? 0) - (dmo.DiscontMoney.EToDecimal() ?? 0);
         Money<decimal>? we = null;