修改。

BO/BO.csproj

@@ -44,6 +44,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -51,11 +52,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Utils\ButcherAppContext.cs" />
     <Compile Include="BO\Bill\WeightBill\WeightBill.cs" />
-    <Compile Include="BO\Bill\WeightBill\WeightBill_AbnormalDetail.cs" />
     <Compile Include="BO\Bill\WeightBill\WeightBill_Detail.cs" />
     <Compile Include="BO\Bill\WeightBill\WeightBill_FarmerDetail.cs" />
     <Compile Include="BO\Bill\WeightBill\WeightBill_HouseDetail.cs" />
+    <Compile Include="BO\Bill\WeightBill\WeightBill_SanctionDetail.cs" />
+    <Compile Include="BO\SyncBase.cs" />
+    <Compile Include="BO\SyncBill.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils\BaseInfoRpcUtil.cs" />
     <Compile Include="Utils\BillRpc\WeightBillRpc.cs" />

BO/BO/Bill/WeightBill/WeightBill.cs

@@ -1,49 +1,65 @@
-using System;
+using Forks.EnterpriseServices.DomainObjects2;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using TSingSoft.WebPluginFramework;
 
 namespace BO.BO
 {
-  public class WeightBill
+  [Serializable]
+  public class WeightBill : SyncBill
   {
-    public string CreaterName { get; set; }
+    public long? AccountingUnit_ID { get; set; }
+
+    public long? Department_ID { get; set; }
+
+    public long? Employee_ID { get; set; }
+
+    public string Employee_Name { get; set; }
+
+    public DateTime? WeighTime { get; set; }
+
     public long? Supplier_ID { get; set; }
 
     public string Supplier_Name { get; set; }
 
+    public long? Zone_ID { get; set; }
+
+    public string Zone_Name { get; set; }
+
     public short? PurchaseType_ID { get; set; }
 
     public string PurchaseType_Name { get; set; }
 
-    public DateTime? WeightTime { get; set; }
-
     public long? Car_ID { get; set; }
 
     public string Car_Name { get; set; }
 
-    public long? Livestock_ID { get; set; }
+    public long? LiveVarieties_ID { get; set; }
 
-    public string Livestock_Name { get; set; }
-
-    public long? Employee_ID { get; set; }
-
-    public string Employee_Name { get; set; }
+    public string LiveVarieties_Name { get; set; }
 
     public long? HogGrade_ID { get; set; }
 
     public string HogGrade_Name { get; set; }
 
-    public long? Zone_ID { get; set; }
-
-    public string Zone_Name { get; set; }
-
-    public decimal? PenWeight { get; set; }
+    public decimal? ShackWeight { get; set; }
 
-    public decimal? PenPrice { get; set; }
+    public decimal? ShackPrice { get; set; }
 
-    public decimal? PenMoney { get; set; }
+    [NonDmoProperty]
+    public decimal? ShackMoney
+    {
+      get
+      {
+        var v = ShackPrice * ShackWeight;
+        if (v.HasValue)
+          return decimal.Round(v.Value, 2);
+        return null;
+      }
+    }
 
     public string AnimalTestNumber { get; set; }
 
@@ -51,13 +67,47 @@ namespace BO.BO
 
     public string AnimalTestMan { get; set; }
 
+    public long? Inspector_ID { get; set; }
+
+    public string Inspector_Name { get; set; }
+
     public string Remark { get; set; }
 
-    public long? Inspector_ID { get; set; }
 
-    public long? Inspector_Name { get; set; }
+    private List<WeightBill_Detail> _details = new List<WeightBill_Detail>();
+    public List<WeightBill_Detail> Details { get { return _details; } }
+
+    public int Number { get { return _details.Sum(x => (x.Number ?? 0)); } }
+
+    public decimal Weight { get { return _details.Sum(x => (x.Weight ?? 0)); } }
+
+    private List<WeightBill_FarmerDetail> _farmerDetails = new List<WeightBill_FarmerDetail>();
+    public List<WeightBill_FarmerDetail> FarmerDetails { get { return _farmerDetails; } }
+
+    public string FarmerNames
+    {
+      get
+      {
+        if (_farmerDetails.Any()) return string.Join(",", _farmerDetails.Select(x => x.Farmer_Name));
+        return null;
+      }
+    }
+
+    private List<WeightBill_HouseDetail> _houseDetails = new List<WeightBill_HouseDetail>();
+    public List<WeightBill_HouseDetail> HouseDetails { get { return _houseDetails; } }
+
+    public string HouseNames
+    {
+      get
+      {
+        if (_houseDetails.Any()) return string.Join(",", _houseDetails.Select(x => x.LiveColonyHouse_Name));
+        return null;
+      }
+    }
+
+    private List<WeightBill_SanctionDetail> _sanctionDetails = new List<WeightBill_SanctionDetail>();
+    public List<WeightBill_SanctionDetail> SanctionDetails { get { return _sanctionDetails; } }
 
-   // List<WeightBill_FarmerDetail> _farmerDetails = new List<WeightBill_FarmerDetail>();
-    //public List<WeightBill_FarmerDetail> FarmerDetails { get { return _farmerDetails; } }
+    public int SanctionNumber { get { return _sanctionDetails.Sum(x => (x.Number ?? 0)); } }
   }
 }

BO/BO/Bill/WeightBill/WeightBill_AbnormalDetail.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BO.BO
-{
-  public class WeightBill_AbnormalDetail
-  {
-  }
-}

BO/BO/Bill/WeightBill/WeightBill_Detail.cs

@@ -6,7 +6,19 @@ using System.Threading.Tasks;
 
 namespace BO.BO
 {
-  public class WeightBill_Detail
+  [Serializable]
+  public class WeightBill_Detail : SyncBase
   {
+    public long WeightBill_ID { get; set; }
+
+    public int Index { get; set; }
+
+    public int? Number { get; set; }
+
+    public decimal? PiWeight { get; set; }
+
+    public decimal? MaoWeight { get; set; }
+
+    public decimal? Weight { get; set; }
   }
 }

BO/BO/Bill/WeightBill/WeightBill_FarmerDetail.cs

@@ -6,8 +6,11 @@ using System.Threading.Tasks;
 
 namespace BO.BO
 {
-  public class WeightBill_FarmerDetail
+  [Serializable]
+  public class WeightBill_FarmerDetail : SyncBase
   {
+    public long WeightBill_ID { get; set; }
+
     public int Index { get; set; }
 
     public long? Farmer_ID { get; set; }

BO/BO/Bill/WeightBill/WeightBill_HouseDetail.cs

@@ -6,7 +6,17 @@ using System.Threading.Tasks;
 
 namespace BO.BO
 {
-  public class WeightBill_HouseDetail
+  [Serializable]
+  public class WeightBill_HouseDetail : SyncBase
   {
+    public long WeightBill_ID { get; set; }
+
+    public int Index { get; set; }
+
+    public long? LiveColonyHouse_ID { get; set; }
+
+    public long? LiveColonyHouse_Name { get; set; }
+
+    public int? Number { get; set; }
   }
 }

BO/BO/Bill/WeightBill/WeightBill_SanctionDetail.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+  [Serializable]
+  public class WeightBill_SanctionDetail : SyncBase
+  {
+    public long WeightBill_ID { get; set; }
+
+    public int Index { get; set; }
+
+    /// <summary>
+    /// 异常奖罚配置
+    /// </summary>
+    public long? Sanction_ID { get; set; }
+
+    /// <summary>
+    /// 异常项目ID
+    /// </summary>
+    public long? AbnormalItem_ID { get; set; }
+
+    /// <summary>
+    /// 异常项目名称
+    /// </summary>
+    public long? AbnormalItem_Name { get; set; }
+
+    public int? Number { get; set; }
+  }
+}

BO/BO/SyncBase.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+  [Serializable]
+  public abstract class SyncBase
+  {
+    public long ID { get; set; }
+
+    /// <summary>
+    /// 对应B3ID
+    /// </summary>
+    public long? B3ID { get; set; }
+
+    /// <summary>
+    /// 删除状态
+    /// </summary>
+    public bool DeleteState { get; set; }
+  }
+}

BO/BO/SyncBill.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BO.BO
+{
+  [Serializable]
+  public class SyncBill : SyncBase
+  {
+    /// <summary>
+    /// 单据创建人用户名
+    /// </summary>
+    public string Creator { get; set; }
+
+    /// <summary>
+    /// 单据是否完整可以上传
+    /// </summary>
+    public bool FinishCreate { get; set; }
+  }
+}

BO/Utils/BillRpc/WeightBillRpc.cs

@@ -15,32 +15,192 @@ namespace BO.Utils.BillRpc
     {
       const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/UploadBill";
       var obj = new RpcObject("/MainSystem/B3ClientService/BO/WeightBill");
-      obj.Set("CreaterName", bo.CreaterName);
+      if (bo.ID == 0)
+      {
+        obj.Set("Creator", ButcherAppContext.Context.UserConfig.UserName);
+        obj.Set("AccountingUnit_ID", ButcherAppContext.Context.UserConfig.AccountingUnit_ID);
+        obj.Set("Department_ID", ButcherAppContext.Context.UserConfig.Department_ID);
+      }
+      else
+      {
+        obj.Set("Creator", bo.Creator);
+        obj.Set("AccountingUnit_ID", bo.AccountingUnit_ID);
+        obj.Set("Department_ID", bo.Department_ID);
+      }
+      //base
+      obj.Set("ID", bo.ID);
+      obj.Set("B3ID", bo.B3ID);
+      obj.Set("DeleteState", bo.DeleteState);
+
+      //bill
+      obj.Set("FinishCreate", bo.FinishCreate);
+      obj.Set("Sync", false);
+      obj.Set("ModifyTime", DateTime.Now);
+
+      //bill
+      obj.Set("Employee_ID", bo.Employee_ID);
+      obj.Set("Employee_Name", bo.Employee_Name);
+      obj.Set("WeighTime", bo.WeighTime);
       obj.Set("Supplier_ID", bo.Supplier_ID);
       obj.Set("Supplier_Name", bo.Supplier_Name);
+      obj.Set("Zone_ID", bo.Zone_ID);
+      obj.Set("Zone_Name", bo.Zone_Name);
       obj.Set("PurchaseType_ID", bo.PurchaseType_ID);
       obj.Set("PurchaseType_Name", bo.PurchaseType_Name);
-      obj.Set("WeightTime", bo.WeightTime);
       obj.Set("Car_ID", bo.Car_ID);
       obj.Set("Car_Name", bo.Car_Name);
-      obj.Set("Livestock_ID", bo.Livestock_ID);
-      obj.Set("Livestock_Name", bo.Livestock_Name);
-      obj.Set("Employee_ID", bo.Employee_ID);
-      obj.Set("Employee_Name", bo.Employee_Name);
+      obj.Set("LiveVarieties_ID", bo.LiveVarieties_ID);
+      obj.Set("LiveVarieties_Name", bo.LiveVarieties_Name);
       obj.Set("HogGrade_ID", bo.HogGrade_ID);
       obj.Set("HogGrade_Name", bo.HogGrade_Name);
-      obj.Set("Zone_ID", bo.Zone_ID);
-      obj.Set("Zone_Name", bo.Zone_Name);
-      obj.Set("PenWeight", bo.PenWeight);
-      obj.Set("PenPrice", bo.PenPrice);
-      obj.Set("PenMoney", bo.PenMoney);
+      obj.Set("ShackWeight", bo.ShackWeight);
+      obj.Set("ShackPrice", bo.ShackPrice);
       obj.Set("AnimalTestNumber", bo.AnimalTestNumber);
       obj.Set("AnimalTestDate", bo.AnimalTestDate);
       obj.Set("AnimalTestMan", bo.AnimalTestMan);
       obj.Set("Remark", bo.Remark);
+      obj.Set("Inspector_ID", bo.Inspector_ID);
+      obj.Set("Inspector_Name", bo.Inspector_Name);
+
+      const string detailErtPath = "/MainSystem/B3ClientService/BO/WeightBill_Detail";
+
+      var details = new ManyList(detailErtPath);
+      foreach (var detail in bo.Details)
+      {
+        var objDetail = new RpcObject(detailErtPath);
+        objDetail.Set("ID", detail.ID);
+        objDetail.Set("B3ID", detail.B3ID);
+        objDetail.Set("DeleteState", detail.DeleteState);
+        objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
+        objDetail.Set("Index", detail.Index);
+        objDetail.Set("MaoWeight", detail.MaoWeight);
+        objDetail.Set("PiWeight", detail.PiWeight);
+        objDetail.Set("Weight", detail.Weight);
+        objDetail.Set("Number", detail.Number);
+        details.Add(objDetail);
+      }
 
+      obj.Set("Details", details);
+
+      const string farmerDetailErtPath = "/MainSystem/B3ClientService/BO/WeightBill_FarmerDetail";
+
+      var farmerDetils = new ManyList(farmerDetailErtPath);
+      foreach (var detail in bo.FarmerDetails)
+      {
+        var objDetail = new RpcObject(farmerDetailErtPath);
+        objDetail.Set("ID", detail.ID);
+        objDetail.Set("B3ID", detail.B3ID);
+        objDetail.Set("DeleteState", detail.DeleteState);
+        objDetail.Set("WeightBill_ID", detail.WeightBill_ID);
+        objDetail.Set("Index", detail.Index);
+        objDetail.Set("Farmer_ID", detail.Farmer_ID);
+        objDetail.Set("Farmer_Name", detail.Farmer_Name);
+        objDetail.Set("Number", detail.Number);
+        farmerDetils.Add(objDetail);
+      }
+
+      obj.Set("FarmerDetails", farmerDetils);
+
+      var result = RpcFacade.Call<RpcObject>(method, obj);
+      bo.ID = result.Get<long>("ID");
+      var detailReturns = result.Get<List<RpcObject>>("DetailBack");
+      var rDetails = detailReturns[0].Get<List<RpcObject>>("DetailBack");
+      foreach (var item in rDetails)
+      {
+        var idx = Convert.ToInt32(item.Get<string>("Flag"));
+        bo.Details.First(x => x.Index == idx).ID = item.Get<long>("ID");
+      }
+      var rFarmerDetails = detailReturns[1].Get<List<RpcObject>>("DetailBack");
+      foreach (var item in rFarmerDetails)
+      {
+        var idx = Convert.ToInt32(item.Get<string>("Flag"));
+        bo.FarmerDetails.First(x => x.Index == idx).ID = item.Get<long>("ID");
+      }
+
+      return true;
+    }
+
+    public static bool Delete(long id)
+    {
+      const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/DeleteBill";
+      return RpcFacade.Call<bool>(method, id);
+    }
+
+    public static List<WeightBill> GetWeightBillList()
+    {
+      const string method = "/MainSystem/B3ClientService/Rpcs/BillRpc/WeightBillRpc/GetWeightBillList";
+      var list = RpcFacade.Call<List<RpcObject>>(method, DateTime.Today);
+      var result = new List<WeightBill>();
+      foreach (var obj in list)
+      {
+        var entity = new WeightBill();
+        result.Add(entity);
+        entity.Creator = obj.Get<string>("Creator");
+        entity.AccountingUnit_ID = obj.Get<long?>("AccountingUnit_ID");
+        entity.Department_ID = obj.Get<long?>("Department_ID");
+        entity.ID = obj.Get<long>("ID");
+        entity.B3ID = obj.Get<long?>("B3ID");
+        entity.DeleteState = false;
+        entity.FinishCreate = obj.Get<bool>("FinishCreate");
+        entity.Employee_ID = obj.Get<long?>("Employee_ID");
+        entity.Employee_Name = obj.Get<string>("Employee_Name");
+        entity.WeighTime = obj.Get<DateTime?>("WeighTime");
+        entity.Supplier_ID = obj.Get<long?>("Supplier_ID");
+        entity.Supplier_Name = obj.Get<string>("Supplier_Name");
+        entity.Zone_ID = obj.Get<long?>("Zone_ID");
+        entity.Zone_Name = obj.Get<string>("Zone_Name");
+        entity.PurchaseType_ID = obj.Get<short?>("PurchaseType_ID");
+        entity.PurchaseType_Name = obj.Get<string>("PurchaseType_Name");
+        entity.Car_ID = obj.Get<long?>("Car_ID");
+        entity.Car_Name = obj.Get<string>("Car_Name");
+        entity.LiveVarieties_ID = obj.Get<long?>("LiveVarieties_ID");
+        entity.LiveVarieties_Name = obj.Get<string>("LiveVarieties_Name");
+        entity.HogGrade_ID = obj.Get<long?>("HogGrade_ID");
+        entity.HogGrade_Name = obj.Get<string>("HogGrade_Name");
+        entity.ShackWeight = obj.Get<decimal?>("ShackWeight");
+        entity.ShackPrice = obj.Get<decimal?>("ShackPrice");
+        entity.AnimalTestNumber = obj.Get<string>("AnimalTestNumber");
+        entity.AnimalTestDate = obj.Get<DateTime?>("AnimalTestDate");
+        entity.AnimalTestMan = obj.Get<string>("AnimalTestMan");
+        entity.Remark = obj.Get<string>("Remark");
+        entity.Inspector_ID = obj.Get<long?>("Inspector_ID");
+        entity.Inspector_Name = obj.Get<string>("Inspector_Name");
+        var details = obj.Get<ManyList>("Details");
+        foreach (var detail in details)
+        {
+          var d = new WeightBill_Detail();
+          d.DeleteState = detail.Get<bool>("DeleteState");
+          if (d.DeleteState)
+            continue;
+          entity.Details.Add(d);
+          d.ID = detail.Get<long>("ID");
+          d.B3ID = detail.Get<long?>("B3ID");
+          d.Index = detail.Get<int>("Index");
+          d.MaoWeight = detail.Get<decimal?>("MaoWeight");
+          d.PiWeight = detail.Get<decimal?>("PiWeight");
+          d.Number = detail.Get<int?>("Number");
+          d.Weight = detail.Get<decimal?>("Weight");
+          d.WeightBill_ID = detail.Get<long>("WeightBill_ID");
+        }
 
-      return RpcFacade.Call<bool>(method, obj);
+        var farmers = obj.Get<ManyList>("FarmerDetails");
+        foreach (var detail in farmers)
+        {
+          var d = new WeightBill_FarmerDetail();
+          d.DeleteState = detail.Get<bool>("DeleteState");
+          if (d.DeleteState)
+            continue;
+          entity.FarmerDetails.Add(d);
+          d.ID = detail.Get<long>("ID");
+          d.B3ID = detail.Get<long?>("B3ID");
+          d.Index = detail.Get<int>("Index");
+          d.Farmer_ID = detail.Get<long?>("Farmer_ID");
+          d.Farmer_Name = detail.Get<string>("Farmer_Name");
+          d.Number = detail.Get<int?>("Number");
+          d.WeightBill_ID = detail.Get<long>("WeightBill_ID");
+        }
+      }
+      return result;
     }
   }
 }

ButcherManageClient/AppContext.cs → BO/Utils/ButcherAppContext.cs

@@ -7,9 +7,9 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace ButcherManageClient
+namespace BO.Utils
 {
-  public class AppContext
+  public class ButcherAppContext
   {
     private static string loginConfigPath = Application.StartupPath + "\\Config.xml";
     public ServerUrlConfig UrlConfig
@@ -24,13 +24,13 @@ namespace ButcherManageClient
       set;
     }
 
-    private AppContext()
+    private ButcherAppContext()
     {
       UrlConfig = new ServerUrlConfig();
       UserConfig = new LoginUserInfo();
     }
 
-    public static AppContext Context
+    public static ButcherAppContext Context
     {
       get
       {
@@ -40,16 +40,16 @@ namespace ButcherManageClient
       }
     }
 
-    private static AppContext _appContext;
-    static AppContext CreateAppContext()
+    private static ButcherAppContext _appContext;
+    static ButcherAppContext CreateAppContext()
     {
-      var config = new AppContext();
+      var config = new ButcherAppContext();
       if (!File.Exists(loginConfigPath))
       {
         XmlUtil.SerializerObjToFile(config, loginConfigPath);
       }
       else
-        config = XmlUtil.DeserializeFromFile<AppContext>(loginConfigPath);
+        config = XmlUtil.DeserializeFromFile<ButcherAppContext>(loginConfigPath);
       return config;
     }
 

BWP.WinFormControl/UComboBox.cs

@@ -120,6 +120,11 @@ namespace BWP.WinFormControl
       this.SelectedItem = new WordPair(displayValue, phyValue);
     }
 
+    public void Clear()
+    {
+      this.SelectedItem = null;
+    }
+
     public bool IsEmpty
     {
       get { return SelectedValue == null; }

ButcherManageClient/ButcherManageClient.csproj

@@ -61,7 +61,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AfterLoginUtil.cs" />
-    <Compile Include="AppContext.cs" />
     <Compile Include="Login.cs">
       <SubType>Form</SubType>
     </Compile>

ButcherManageClient/Login.cs

@@ -21,16 +21,16 @@ namespace ButcherManageClient
     {
       if (rpcFacadeInited)
         return;
-      if (string.IsNullOrEmpty(AppContext.Context.UrlConfig.ServerUrl))
+      if (string.IsNullOrEmpty(ButcherAppContext.Context.UrlConfig.ServerUrl))
         throw new Exception("请先设置服务器地址");
-      RpcFacade.Init(AppContext.Context.UrlConfig.ServerUrl, "B3ButcherManageClient");
+      RpcFacade.Init(ButcherAppContext.Context.UrlConfig.ServerUrl, "B3ButcherManageClient");
       rpcFacadeInited = true;
     }
 
     public Login()
     {
       InitializeComponent();
-      userNameTxt.Text = AppContext.Context.UserConfig.UserName;
+      userNameTxt.Text = ButcherAppContext.Context.UserConfig.UserName;
       pwdTxt.Text = "123";
     }
 
@@ -49,8 +49,8 @@ namespace ButcherManageClient
       IniteRpcFacade();
 
       await Task.Factory.StartNew(() => RpcFacade.Login(username, pwd));
-      LoginRpcUtil.FillUserEmpInfo(username, AppContext.Context.UserConfig);
-      AppContext.Context.Save();
+      LoginRpcUtil.FillUserEmpInfo(username, ButcherAppContext.Context.UserConfig);
+      ButcherAppContext.Context.Save();
       var form = AfterLoginUtil.CreateForm("_1");
       if (form == null)
         throw new Exception("权限不符");

ButcherManageClient/SettingForm.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using BO.Utils;
 
 namespace ButcherManageClient
 {
@@ -15,7 +16,7 @@ namespace ButcherManageClient
     public SettingForm()
     {
       InitializeComponent();
-      uTextBoxWithPad1.Text = AppContext.Context.UrlConfig.ServerUrl;
+      uTextBoxWithPad1.Text = ButcherAppContext.Context.UrlConfig.ServerUrl;
     }
 
     private void cancelBtn_Click(object sender, EventArgs e)
@@ -25,8 +26,8 @@ namespace ButcherManageClient
 
     private void saveBtn_Click(object sender, EventArgs e)
     {
-      AppContext.Context.UrlConfig.ServerUrl = this.uTextBoxWithPad1.Text.Trim();
-      AppContext.Context.Save();
+      ButcherAppContext.Context.UrlConfig.ServerUrl = this.uTextBoxWithPad1.Text.Trim();
+      ButcherAppContext.Context.Save();
       MessageBox.Show("设置保存成功!");
     }
   }

ButcherWeight/WeightForm.cs

@@ -16,6 +16,18 @@ namespace ButcherWeight
 {
   public partial class WeightForm : Form, IAfterLogin
   {
+    #region IAfterLogin Member
+    public string RoleName
+    {
+      get { return "_1"; }
+    }
+
+    public Form Generate()
+    {
+      return this;
+    }
+    #endregion
+
     public WeightForm()
     {
       InitializeComponent();
@@ -27,19 +39,14 @@ namespace ButcherWeight
       hogGradeSelect.Init("BaseInfoRpc/GetHogGradeList");
       zoneSelect.Init("BaseInfoRpc/GetZoneList");
       farmerSelect.Init("BaseInfoRpc/GetFarmerList");
+      farmerSelect.EnableTopItem = false;
+      weightTimeSelect.Date = DateTime.Now;
+      testTimeInput.Date = DateTime.Now;
+      dmoList = WeightBillRpc.GetWeightBillList();
     }
 
-    #region IAfterLogin Member
-    public string RoleName
-    {
-      get { return "_1"; }
-    }
-
-    public Form Generate()
-    {
-      return this;
-    }
-    #endregion
+    private List<WeightBill> dmoList = new List<WeightBill>();
+    private WeightBill Dmo = new WeightBill();
 
     private void exitBtn_Click(object sender, EventArgs e)
     {
@@ -49,9 +56,9 @@ namespace ButcherWeight
     private void commitBtn_Click(object sender, EventArgs e)
     {
       GetFromUI();
-      //var result = WeightBillRpc.Send(Dmo);
-      //if (result)
-      //  MessageBox.Show("保存成功！");
+      var result = WeightBillRpc.Send(Dmo);
+      if (result)
+        MessageBox.Show("保存成功！");
     }
 
     private void readMaoBtn_Click(object sender, EventArgs e)
@@ -66,25 +73,46 @@ namespace ButcherWeight
 
     private void farmerSelect_SelectedIndexChanged(object sender, EventArgs e)
     {
-
+      if (farmerSelect.IsEmpty)
+        return;
+      var detail = new WeightBill_FarmerDetail();
+      detail.Farmer_ID = farmerSelect.LongValue.Value;
+      if (Dmo.FarmerDetails.Any(x => x.Farmer_ID == detail.Farmer_ID))
+        return;
+      detail.Farmer_Name = farmerSelect.DisplayValue;
+      Dmo.FarmerDetails.Add(detail);
+      detail.Index = Dmo.FarmerDetails.Max(x => x.Index) + 1;
+      detail.WeightBill_ID = Dmo.ID;
+
+       farmerSelect.Clear();
     }
 
-    WeightBill _dmo = new WeightBill() { CreaterName = AppContext.Context.UserConfig.UserName };
-    WeightBill Dmo { get { return _dmo; } }
-
     void GetFromUI()
     {
+      if (!employeeSelect.IsEmpty)
+      {
+        Dmo.Employee_ID = long.Parse(employeeSelect.Value);
+        Dmo.Employee_Name = employeeSelect.DisplayValue;
+      }
+      Dmo.WeighTime = weightTimeSelect.Date;
+
       if (!supplierSelect.IsEmpty)
       {
         Dmo.Supplier_ID = long.Parse(supplierSelect.Value);
         Dmo.Supplier_Name = supplierSelect.DisplayValue;
       }
+
+      if (!zoneSelect.IsEmpty)
+      {
+        Dmo.Zone_ID = long.Parse(zoneSelect.Value);
+        Dmo.Zone_Name = zoneSelect.DisplayValue;
+      }
+
       if (!purchaseTypeSelect.IsEmpty)
       {
         Dmo.PurchaseType_ID = short.Parse(purchaseTypeSelect.Value);
         Dmo.PurchaseType_Name = purchaseTypeSelect.DisplayValue;
       }
-      Dmo.WeightTime = weightTimeSelect.Date;
       if (!carSelect.IsEmpty)
       {
         Dmo.Car_ID = long.Parse(carSelect.Value);
@@ -92,80 +120,78 @@ namespace ButcherWeight
       }
       if (!liveVarietiesSelect.IsEmpty)
       {
-        Dmo.Livestock_ID = long.Parse(liveVarietiesSelect.Value);
-        Dmo.Livestock_Name = liveVarietiesSelect.DisplayValue;
-      }
-      if (!employeeSelect.IsEmpty)
-      {
-        Dmo.Employee_ID = long.Parse(employeeSelect.Value);
-        Dmo.Employee_Name = employeeSelect.DisplayValue;
+        Dmo.LiveVarieties_ID = long.Parse(liveVarietiesSelect.Value);
+        Dmo.LiveVarieties_Name = liveVarietiesSelect.DisplayValue;
       }
+
       if (!hogGradeSelect.IsEmpty)
       {
         Dmo.HogGrade_ID = long.Parse(hogGradeSelect.Value);
         Dmo.HogGrade_Name = hogGradeSelect.DisplayValue;
       }
-      if (!zoneSelect.IsEmpty)
-      {
-        Dmo.Zone_ID = long.Parse(zoneSelect.Value);
-        Dmo.Zone_Name = zoneSelect.DisplayValue;
-      }
+
       if (!string.IsNullOrEmpty(penWeightInput.Text))
       {
         decimal pw = 0;
         if (!decimal.TryParse(penWeightInput.Text.Trim(), out pw))
           throw new Exception("棚前重量输入错误");
-        Dmo.PenWeight = pw;
+        Dmo.ShackWeight = pw;
       }
       if (!string.IsNullOrEmpty(penPriceInput.Text))
       {
         decimal pp = 0;
         if (!decimal.TryParse(penPriceInput.Text.Trim(), out pp))
           throw new Exception("棚前单价输入错误");
-        Dmo.PenPrice = pp;
+        Dmo.ShackPrice = pp;
       }
-      Dmo.PenMoney = Dmo.PenPrice * Dmo.PenWeight;
       if (!string.IsNullOrEmpty(testCardNumberInput.Text))
         Dmo.AnimalTestNumber = testCardNumberInput.Text;
+
       if (!string.IsNullOrEmpty(testTimeInput.Text))
         Dmo.AnimalTestDate = testTimeInput.Date;
+
       if (!string.IsNullOrEmpty(testManInput.Text))
         Dmo.AnimalTestMan = testManInput.Text;
+
       if (!string.IsNullOrEmpty(remarkInput.Text))
         Dmo.Remark = remarkInput.Text;
     }
 
     void AppToUI()
     {
+      ResetControl();
+      if (Dmo.Employee_ID.HasValue)
+        employeeSelect.Fill(Dmo.Employee_Name, Dmo.Employee_ID.ToString());
+
+      if (Dmo.WeighTime.HasValue)
+        weightTimeSelect.Date = Dmo.WeighTime;
+
       if (Dmo.Supplier_ID.HasValue)
         supplierSelect.Fill(Dmo.Supplier_Name, Dmo.Supplier_ID.ToString());
+
+      if (Dmo.Zone_ID.HasValue)
+        zoneSelect.Fill(Dmo.Zone_Name, Dmo.Zone_ID.ToString());
+
       if (Dmo.PurchaseType_ID.HasValue)
         purchaseTypeSelect.Fill(Dmo.PurchaseType_Name, Dmo.PurchaseType_ID.ToString());
-      weightTimeSelect.Date = Dmo.WeightTime.Value;
-      Dmo.WeightTime = weightTimeSelect.Date;
 
       if (Dmo.Car_ID.HasValue)
         carSelect.Fill(Dmo.Car_Name, Dmo.Car_ID.ToString());
 
-      if (Dmo.Livestock_ID.HasValue)
-        liveVarietiesSelect.Fill(Dmo.Livestock_Name, Dmo.Livestock_ID.ToString());
-
-      if (Dmo.Employee_ID.HasValue)
-        employeeSelect.Fill(Dmo.Employee_Name, Dmo.Employee_ID.ToString());
+      if (Dmo.LiveVarieties_ID.HasValue)
+        liveVarietiesSelect.Fill(Dmo.LiveVarieties_Name, Dmo.LiveVarieties_ID.ToString());
 
       if (Dmo.HogGrade_ID.HasValue)
         hogGradeSelect.Fill(Dmo.HogGrade_Name, Dmo.HogGrade_ID.ToString());
-      if (Dmo.Zone_ID.HasValue)
-        zoneSelect.Fill(Dmo.Zone_Name, Dmo.Zone_ID.ToString());
 
-      if (Dmo.PenWeight.HasValue)
-        penWeightInput.Text = Dmo.PenWeight.Value.ToString();
+      if (Dmo.ShackWeight.HasValue)
+        penWeightInput.Text = Dmo.ShackWeight.Value.ToString();
 
-      if (Dmo.PenPrice.HasValue)
-        penPriceInput.Text = Dmo.PenPrice.Value.ToString();
+      if (Dmo.ShackPrice.HasValue)
+        penPriceInput.Text = Dmo.ShackPrice.Value.ToString();
 
-      if (Dmo.PenMoney.HasValue)
-        penMoneyInput.Text = Dmo.PenMoney.Value.ToString();
+      if (Dmo.ShackMoney.HasValue)
+        penMoneyInput.Text = Dmo.ShackMoney.Value.ToString();
 
       if (!string.IsNullOrEmpty(Dmo.AnimalTestNumber))
         testCardNumberInput.Text = Dmo.AnimalTestNumber;
@@ -179,5 +205,25 @@ namespace ButcherWeight
       if (!string.IsNullOrEmpty(Dmo.Remark))
         remarkInput.Text = Dmo.Remark;
     }
+
+    void ResetControl()
+    {
+      employeeSelect.Clear();
+      weightTimeSelect.Date = null;
+      supplierSelect.Clear();
+      zoneSelect.Clear();
+      purchaseTypeSelect.Clear();
+      carSelect.Clear();
+      liveVarietiesSelect.Clear();
+      hogGradeSelect.Clear();
+      penWeightInput.Text = null;
+      penPriceInput.Text = null;
+      penMoneyInput.Text = null;
+      testCardNumberInput.Text = null;
+      testTimeInput.Date = null;
+      testManInput.Text = null;
+      remarkInput.Text = null;
+
+    }
   }
 }

ButcherWeight/WeightForm.resx

@@ -117,136 +117,124 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_Farmer_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_Farmer_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="F_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_MaoWeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_PiWeight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="D_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_LiveColonyHouse_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_LiveColonyHouse_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="H_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_WeightBill_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_Sanction_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_AbnormalItem_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_AbnormalItem_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="S_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_B3ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_Supplier_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_Zone_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_FarmerNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_PurchaseType_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_Number.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_Weight.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_HouseNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="M_SanctionNumber.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>