diff --git a/B3ClientService/BO/BaseInfo/Farmer.cs b/B3ClientService/BO/BaseInfo/Farmer.cs index 1252d6a..89cacdc 100644 --- a/B3ClientService/BO/BaseInfo/Farmer.cs +++ b/B3ClientService/BO/BaseInfo/Farmer.cs @@ -9,5 +9,10 @@ namespace BWP.B3ClientService.BO [Serializable] public class Farmer : BaseInfo { + public string IDCard { get; set; } + + public string Tel { get; set; } + + public string Address { get; set; } } } diff --git a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs index 8d04f7f..fcd7e8f 100644 --- a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs +++ b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs @@ -64,6 +64,15 @@ namespace BWP.B3ClientService.BO public string AnimalTestMan { get; set; } public string Remark { get; set; } + + public string Farmer_Name { get; set; } + + public string Farmer_IDCard { get; set; } + + public string Farmer_Tel { get; set; } + + public string Farmer_Address { get; set; } + #endregion #region Special diff --git a/B3ClientService/BO/MaterialRequisitionRecord_/MaterialRequisitionRecord.cs b/B3ClientService/BO/MaterialRequisitionRecord_/MaterialRequisitionRecord.cs index d5240cd..0fa8025 100644 --- a/B3ClientService/BO/MaterialRequisitionRecord_/MaterialRequisitionRecord.cs +++ b/B3ClientService/BO/MaterialRequisitionRecord_/MaterialRequisitionRecord.cs @@ -47,5 +47,7 @@ namespace BWP.B3ClientService.BO public int RowVersion { get; set; } public DateTime? CreateTime { get; set; } + + public long? GroupID { get; set; } } } diff --git a/B3ClientService/Rpcs/BillRpc/MaterialRequisitionRecordRpc_/MaterialRequisitionRecordRpc.cs b/B3ClientService/Rpcs/BillRpc/MaterialRequisitionRecordRpc_/MaterialRequisitionRecordRpc.cs index 898f7aa..3e90635 100644 --- a/B3ClientService/Rpcs/BillRpc/MaterialRequisitionRecordRpc_/MaterialRequisitionRecordRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/MaterialRequisitionRecordRpc_/MaterialRequisitionRecordRpc.cs @@ -102,14 +102,21 @@ namespace BWP.B3ClientService.Rpcs.BillRpc } [Rpc] - public static int FillWeight(long id, decimal weight) + public static int FillWeight(long id, decimal weight, List ids) { var update = new DQUpdateDom(typeof(MaterialRequisitionRecord)); update.Where.Conditions.Add(DQCondition.EQ("ID", id)); + update.Columns.Add(new DQUpdateColumn("GroupID", id)); update.Columns.Add(new DQUpdateColumn("Weight", weight)); + + var up2 = new DQUpdateDom(typeof(MaterialRequisitionRecord)); + up2.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("ID"), ids.Select(x => DQExpression.Value(x)).ToArray())); + up2.Columns.Add(new DQUpdateColumn("GroupID", id)); + up2.Columns.Add(new DQUpdateColumn("Weight", 0)); using (var session = Dmo.NewSession()) { session.ExecuteNonQuery(update); + session.ExecuteNonQuery(up2); session.Commit(); } return 1; diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs index 2d15ad1..46ce681 100644 --- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs @@ -345,5 +345,13 @@ namespace BWP.B3ClientService.Rpcs.BillRpc query.Where.Conditions.Add(DQCondition.EQ("ID", id)); return query.EExecuteScalar(); } + + [Rpc] + public static string GetFarmerInfo(long id) + { + var query = new DmoQuery(typeof(Farmer)); + query.Where.Conditions.Add(DQCondition.EQ("ID", id)); + return serializer.Serialize(query.EExecuteScalar()); + } } } diff --git a/B3ClientService/Tasks/SyncInfoFromServer.cs b/B3ClientService/Tasks/SyncInfoFromServer.cs index 9af40be..620255f 100644 --- a/B3ClientService/Tasks/SyncInfoFromServer.cs +++ b/B3ClientService/Tasks/SyncInfoFromServer.cs @@ -367,7 +367,24 @@ namespace BWP.B3ClientService.Tasks void SyncFarmer() { - SyncBaseInfo("GetFarmer"); + var list = RpcFacade.Call>("/MainSystem/B3ButcherManage/Rpcs/TouchScreenRpcs/GetFarmer"); + using (var context = new TransactionContext()) + { + var sql1 = @"truncate table [B3ClientService_Farmer];"; + context.Session.ExecuteSqlNonQuery(sql1); + foreach (RpcObject o in list) + { + var entity = new Farmer(); + entity.ID = o.Get("ID"); + entity.Name = o.Get("Name"); + entity.Spell = o.Get("Spell"); + entity.Tel = o.Get("Tel"); + entity.Address = o.Get("Address"); + entity.IDCard = o.Get("IDCard"); + context.Session.Insert(entity); + } + context.Commit(); + } } void SyncHogGrade()