diff --git a/BO/Utils/BillRpc/GradeAndWeightRpc.cs b/BO/Utils/BillRpc/GradeAndWeightRpc.cs index 03c867c..4b91df4 100644 --- a/BO/Utils/BillRpc/GradeAndWeightRpc.cs +++ b/BO/Utils/BillRpc/GradeAndWeightRpc.cs @@ -212,22 +212,21 @@ namespace BO.Utils.BillRpc update.Columns.Add(new DQUpdateColumn(p, type.GetProperty(p).GetValue(detail))); } update.Columns.Add(new DQUpdateColumn("Sync", false)); - session.ExecuteNonQuery(update); session.Commit(); } } - public static void Update(GradeAndWeight_Detail detail, GradeAndWeight toEntity) - { - if (toEntity == null) - { - throw new Exception(string.Format("请选择左侧的{0}顺序", detail.Technics_Name)); - } - detail.Order = toEntity.Order; - detail.OrderDetail_ID = toEntity.OrderDetail_ID; - Update(detail, "OrderDetail_ID", "Order", "Livestock_ID", "Livestock_Name", "Technics", "Technics_Name"); - } + //public static void Update(GradeAndWeight_Detail detail, GradeAndWeight toEntity) + //{ + // if (toEntity == null) + // { + // throw new Exception(string.Format("请选择左侧的{0}顺序", detail.Technics_Name)); + // } + // detail.Order = toEntity.Order; + // detail.OrderDetail_ID = toEntity.OrderDetail_ID; + // Update(detail, "OrderDetail_ID", "Order", "Livestock_ID", "Livestock_Name", "Technics", "Technics_Name"); + //} public static void Sync() { @@ -272,7 +271,7 @@ namespace BO.Utils.BillRpc { var query = new DmoQuery(typeof(GradeAndWeight_Detail)); query.OrderBy.Expressions.Add(DQOrderByExpression.Create("SID")); - query.Range = SelectRange.Top(50); + query.Range = SelectRange.Top(1); query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Sync", false), DQCondition.IsNotNull(DQExpression.Field("Technics")))); return session.ExecuteList(query).Cast(); diff --git a/WeighAndGrading/GradeFrom.cs b/WeighAndGrading/GradeFrom.cs index 15b12c9..690e712 100644 --- a/WeighAndGrading/GradeFrom.cs +++ b/WeighAndGrading/GradeFrom.cs @@ -136,7 +136,6 @@ namespace WeighAndGrading void UpdateDetial(GradeAndWeight_Detail detail, CTuple btnTag) { var techIsEmpty = detail.Technics == null; - var diff = detail.Technics.HasValue && detail.Technics != btnTag.Item3; detail.Livestock_ID = btnTag.Item1; detail.Livestock_Name = btnTag.Item2; detail.Technics = btnTag.Item3; @@ -147,12 +146,8 @@ namespace WeighAndGrading detail.Order = current.Order; detail.OrderDetail_ID = current.OrderDetail_ID; } - else - { - detail.Order = null; - detail.OrderDetail_ID = null; - } var updateFileNames = new List { "Order", "OrderDetail_ID", "Livestock_ID", "Livestock_Name", "Technics", "Technics_Name" }; + LocalGradeAndWeightBL.Update(detail, updateFileNames.ToArray()); if (techIsEmpty) ResetQueue(); } @@ -1172,7 +1167,7 @@ namespace WeighAndGrading File.WriteAllText(string.Format("{0:yyyyMMddHHmmss}log.txt", DateTime.Now), "错误:" + ex.Message + " \n详细信息:" + ex.StackTrace); } } - Thread.Sleep(2000); + Thread.Sleep(200); } }