yibo 8 years ago
parent
commit
22daca83dd
2 changed files with 13 additions and 19 deletions
  1. +11
    -12
      BO/Utils/BillRpc/GradeAndWeightRpc.cs
  2. +2
    -7
      WeighAndGrading/GradeFrom.cs

+ 11
- 12
BO/Utils/BillRpc/GradeAndWeightRpc.cs View File

@ -212,22 +212,21 @@ namespace BO.Utils.BillRpc
update.Columns.Add(new DQUpdateColumn(p, type.GetProperty(p).GetValue(detail))); update.Columns.Add(new DQUpdateColumn(p, type.GetProperty(p).GetValue(detail)));
} }
update.Columns.Add(new DQUpdateColumn("Sync", false)); update.Columns.Add(new DQUpdateColumn("Sync", false));
session.ExecuteNonQuery(update); session.ExecuteNonQuery(update);
session.Commit(); 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() public static void Sync()
{ {
@ -272,7 +271,7 @@ namespace BO.Utils.BillRpc
{ {
var query = new DmoQuery(typeof(GradeAndWeight_Detail)); var query = new DmoQuery(typeof(GradeAndWeight_Detail));
query.OrderBy.Expressions.Add(DQOrderByExpression.Create("SID")); 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), query.Where.Conditions.Add(DQCondition.And(DQCondition.EQ("Sync", false),
DQCondition.IsNotNull(DQExpression.Field("Technics")))); DQCondition.IsNotNull(DQExpression.Field("Technics"))));
return session.ExecuteList(query).Cast<GradeAndWeight_Detail>(); return session.ExecuteList(query).Cast<GradeAndWeight_Detail>();


+ 2
- 7
WeighAndGrading/GradeFrom.cs View File

@ -136,7 +136,6 @@ namespace WeighAndGrading
void UpdateDetial(GradeAndWeight_Detail detail, CTuple<long, string, short, string> btnTag) void UpdateDetial(GradeAndWeight_Detail detail, CTuple<long, string, short, string> btnTag)
{ {
var techIsEmpty = detail.Technics == null; var techIsEmpty = detail.Technics == null;
var diff = detail.Technics.HasValue && detail.Technics != btnTag.Item3;
detail.Livestock_ID = btnTag.Item1; detail.Livestock_ID = btnTag.Item1;
detail.Livestock_Name = btnTag.Item2; detail.Livestock_Name = btnTag.Item2;
detail.Technics = btnTag.Item3; detail.Technics = btnTag.Item3;
@ -147,12 +146,8 @@ namespace WeighAndGrading
detail.Order = current.Order; detail.Order = current.Order;
detail.OrderDetail_ID = current.OrderDetail_ID; detail.OrderDetail_ID = current.OrderDetail_ID;
} }
else
{
detail.Order = null;
detail.OrderDetail_ID = null;
}
var updateFileNames = new List<string> { "Order", "OrderDetail_ID", "Livestock_ID", "Livestock_Name", "Technics", "Technics_Name" }; var updateFileNames = new List<string> { "Order", "OrderDetail_ID", "Livestock_ID", "Livestock_Name", "Technics", "Technics_Name" };
LocalGradeAndWeightBL.Update(detail, updateFileNames.ToArray());
if (techIsEmpty) if (techIsEmpty)
ResetQueue(); ResetQueue();
} }
@ -1172,7 +1167,7 @@ namespace WeighAndGrading
File.WriteAllText(string.Format("{0:yyyyMMddHHmmss}log.txt", DateTime.Now), "错误:" + ex.Message + " \n详细信息:" + ex.StackTrace); File.WriteAllText(string.Format("{0:yyyyMMddHHmmss}log.txt", DateTime.Now), "错误:" + ex.Message + " \n详细信息:" + ex.StackTrace);
} }
} }
Thread.Sleep(2000);
Thread.Sleep(200);
} }
} }


Loading…
Cancel
Save