diff --git a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs index fcd7e8f..7527370 100644 --- a/B3ClientService/BO/Bill/WeightBill/WeightBill.cs +++ b/B3ClientService/BO/Bill/WeightBill/WeightBill.cs @@ -31,8 +31,12 @@ namespace BWP.B3ClientService.BO public long? Supplier_ID { get; set; } + [ReferenceTo(typeof(Supplier), "Name")] + [Join("Supplier_ID", "ID")] public string Supplier_Name { get; set; } + [ReferenceTo(typeof(Supplier), "BankAccount")] + [Join("Supplier_ID", "ID")] public string BankAccount { get; set; } public long? Zone_ID { get; set; } @@ -65,12 +69,22 @@ namespace BWP.B3ClientService.BO public string Remark { get; set; } + public long? Farmer_ID { get; set; } + + [ReferenceTo(typeof(Farmer), "Name")] + [Join("Farmer_ID", "ID")] public string Farmer_Name { get; set; } + [ReferenceTo(typeof(Farmer), "IDCard")] + [Join("Farmer_ID", "ID")] public string Farmer_IDCard { get; set; } + [ReferenceTo(typeof(Farmer), "Tel")] + [Join("Farmer_ID", "ID")] public string Farmer_Tel { get; set; } + [ReferenceTo(typeof(Farmer), "Address")] + [Join("Farmer_ID", "ID")] public string Farmer_Address { get; set; } #endregion diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs index 46ce681..95c2da9 100644 --- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs @@ -96,6 +96,11 @@ namespace BWP.B3ClientService.Rpcs.BillRpc { json = json.ESerializeDateTime(); var dmo = serializer.Deserialize(json); + var f = dmo.FarmerDetails.FirstOrDefault(x => !x.DeleteState); + if (f == null) + dmo.Farmer_ID = null; + else + dmo.Farmer_ID = f.Farmer_ID; recordDetail = recordDetail.ESerializeDateTime(); var records = serializer.Deserialize>(recordDetail); var result = new BackRpcObj();