diff --git a/B3ClientService/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs b/B3ClientService/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs index 27d8070..1429b1a 100644 --- a/B3ClientService/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs +++ b/B3ClientService/BO/Bill/GradeAndWeight/GradeAndWeight_Detail.cs @@ -11,9 +11,10 @@ namespace BWP.B3ClientService.BO { public int Index { get; set; } - [NonDmoProperty] public long? OrderDetail_ID { get; set; } + public int? Order { get; set; } + public DateTime? Date { get; set; } public short Technics { get; set; } diff --git a/B3ClientService/Rpcs/BillRpc/DropPigRpc.cs b/B3ClientService/Rpcs/BillRpc/DropPigRpc.cs index e85a115..cdf65c4 100644 --- a/B3ClientService/Rpcs/BillRpc/DropPigRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/DropPigRpc.cs @@ -23,7 +23,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var main = new JoinAlias(typeof(OrderDetail)); var second = new JoinAlias(typeof(SecondOrder)); var query = new DQueryDom(main); - query.From.AddJoin(JoinType.Inner, new DQDmoSource(second), DQCondition.And(DQCondition.EQ(main, "ID", second, "OrderDetail_ID"))); + query.From.AddJoin(JoinType.Left, new DQDmoSource(second), DQCondition.And(DQCondition.EQ(main, "ID", second, "OrderDetail_ID"))); query.Columns.Add(DQSelectColumn.Field("B3WeighBill_ID")); query.Columns.Add(DQSelectColumn.Field("ID")); query.Columns.Add(DQSelectColumn.Field("Order")); @@ -43,7 +43,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc entity.OrderDetail_ID = (long)reader[1]; entity.Order = (int)reader[2]; entity.PlanNumber = (int)reader[3]; - entity.HotFadeNumber = (int)reader[4]; + entity.HotFadeNumber = (int?)reader[4] ?? 0; entity.IsDrop = (bool)reader[5]; list.Add(entity); } diff --git a/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs b/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs index 39262f2..203a33f 100644 --- a/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/HouseAndSanctionRpc.cs @@ -241,11 +241,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc var query = new DQueryDom(new JoinAlias(typeof(HurryRecord))); query.Columns.Add(DQSelectColumn.Sum("HurryNumber")); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("WeightBill_ID", wid), DQCondition.IsNull(DQExpression.Field("ToOrderDetail_ID")))); - var rst = query.EExecuteScalar(session); - return rst??0; -// if (rst != null) -// return Convert.ToInt32(rst); -// return 0; + var rst = query.EExecuteScalar(session); + if (rst != null) + return Convert.ToInt32(rst); + return 0; } static List GetList(long billID) diff --git a/B3ClientService/Tasks/SyncInfoFromServer.cs b/B3ClientService/Tasks/SyncInfoFromServer.cs index 967bfa8..52b9d29 100644 --- a/B3ClientService/Tasks/SyncInfoFromServer.cs +++ b/B3ClientService/Tasks/SyncInfoFromServer.cs @@ -355,7 +355,7 @@ namespace BWP.B3ClientService.Tasks public string Name { - get { return "从B3同步数据到Server服务器"; } + get { return "从B3同步基础信息到Server服务器"; } } } } diff --git a/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs b/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs index 31018f5..f77f635 100644 --- a/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs +++ b/B3ClientService/Tasks/UpdateLoad/UploadOrderDetail.cs @@ -98,6 +98,7 @@ namespace BWP.B3ClientService.Tasks.UpdateLoad { var delete = new DQDeleteDom(typeof(OrderDetail)); delete.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("B3ID"), b3IDs.Select(x => DQExpression.Value(x)).ToArray())); + session.ExecuteNonQuery(delete); } static void Update(CTuple item, IDmoSession session)