diff --git a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs index ad3d2d5..d198efe 100644 --- a/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/GradeAndWeightRpc.cs @@ -32,6 +32,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc query.Columns.Add(DQSelectColumn.Field("Order", order)); query.Columns.Add(DQSelectColumn.Field("PlanNumber", order)); query.Columns.Add(DQSelectColumn.Field("HotFadeNumber")); + query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID", order)); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("IsOk", true), DQCondition.EQ(order, "DeleteState", false), DQCondition.EQ(order, "Date", date), DQCondition.EQ(order, "IsDrop", false))); var list = new List(); @@ -52,6 +53,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc continue; entity.OrderDetail_ID = (long)reader[0]; entity.Order = (int)reader[1]; + entity.WeightID = (long?)reader[4]; list.Add(entity); } } @@ -138,6 +140,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc query.Columns.Add(DQSelectColumn.Field("Order")); query.Columns.Add(DQSelectColumn.Field("PlanNumber")); query.Columns.Add(DQSelectColumn.Field("HotFadeNumber", second)); + query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID")); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Date", date), DQCondition.GreaterThanOrEqual("OrderState", 10), DQCondition.EQ("DeleteState", false))); if (order.HasValue) query.Where.Conditions.Add(DQCondition.EQ("Order", order)); @@ -149,7 +152,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var list = new List(); while (reader.Read()) { - list.Add(new DataConfirmList { Order = (int)reader[0], PlanNumber = (int)reader[1], HotFadeNumber = (int?)reader[2] ?? 0 }); + list.Add(new DataConfirmList { Order = (int)reader[0], PlanNumber = (int)reader[1], HotFadeNumber = (int?)reader[2] ?? 0 ,WeightID=(long?)reader[3]}); } return serializer.Serialize(list); } diff --git a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/DataConfirmList.cs b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/DataConfirmList.cs index 3e86f08..b277b62 100644 --- a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/DataConfirmList.cs +++ b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/DataConfirmList.cs @@ -7,6 +7,7 @@ namespace BWP.B3ClientService.Rpcs.RpcBO { public class DataConfirmList { + public long? WeightID { get; set; } public int Order { get; set; } public int PlanNumber { get; set; } diff --git a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs index b897f44..248d0db 100644 --- a/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs +++ b/B3ClientService/Rpcs/RpcBO/Bill/GradeAndWeight/GradeAndWeight.cs @@ -7,6 +7,7 @@ namespace BWP.B3ClientService.RpcBO { public class GradeAndWeight { + public long? WeightID { get; set; } public long OrderDetail_ID { get; set; } public int Order { get; set; }