diff --git a/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs b/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs index 94d1ee3..86c4909 100644 --- a/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs +++ b/B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs @@ -12,7 +12,11 @@ namespace BWP.B3ClientService.BO [BOClass] public class WeightBillCheck { - public long B3ID { get; set; } + public long ID { get; set; } + + [ReferenceTo(typeof(WeightBill), "B3ID")] + [Join("ID", "ID")] + public long? B3ID { get; set; } /// /// 单据创建人用户名 @@ -31,7 +35,7 @@ namespace BWP.B3ClientService.BO if (Exist(id)) return; var entity = new WeightBillCheck(); - entity.B3ID = id; + entity.ID = id; entity.Creator = creator; entity.ModifyTime = DateTime.Now; using (var session = Dmo.NewSession()) @@ -44,15 +48,15 @@ namespace BWP.B3ClientService.BO static bool Exist(long id) { var query = new DQueryDom(new JoinAlias(typeof(WeightBillCheck))); - query.Where.Conditions.Add(DQCondition.EQ("B3ID", id)); + query.Where.Conditions.Add(DQCondition.EQ("ID", id)); return query.EExists(); } - public static void SetSynced(long id) + public static void SetSynced(long b3ID) { var update = new DQUpdateDom(typeof(WeightBillCheck)); update.Columns.Add(new DQUpdateColumn("Sync", true)); - update.Where.Conditions.Add(DQCondition.EQ("B3ID", id)); + update.Where.Conditions.Add(DQCondition.EQ("B3ID", b3ID)); update.EExecute(); } } diff --git a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs index 82b2d97..ea9bcb6 100644 --- a/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs +++ b/B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs @@ -226,6 +226,10 @@ namespace BWP.B3ClientService.Rpcs.BillRpc update.Columns.Add(new DQUpdateColumn("Sync", false)); update.Where.Conditions.Add(DQCondition.EQ("ID", id)); session.ExecuteNonQuery(update); + + var delete = new DQDeleteDom(typeof(WeightBillCheck)); + delete.Where.Conditions.Add(DQCondition.EQ("ID", id)); + session.ExecuteNonQuery(delete); session.Commit(); } @@ -303,9 +307,9 @@ namespace BWP.B3ClientService.Rpcs.BillRpc } [Rpc] - public static int DoCheck(long b3ID, string creator) + public static int DoCheck(long id, string creator) { - WeightBillCheck.Insert(b3ID, creator); + WeightBillCheck.Insert(id, creator); return 1; } } diff --git a/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs b/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs index 78857ba..77080d1 100644 --- a/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs +++ b/B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs @@ -28,7 +28,7 @@ namespace BWP.B3ClientService.Tasks.UpdateLoad var query = new DQueryDom(new JoinAlias(typeof(WeightBillCheck))); query.Columns.Add(DQSelectColumn.Field("B3ID")); query.Columns.Add(DQSelectColumn.Field("Creator")); - query.Where.Conditions.Add(DQCondition.EQ("Sync", false)); + query.Where.Conditions.Add(DQCondition.And(DQCondition.IsNotNull(DQExpression.Field("B3ID")), DQCondition.EQ("Sync", false))); return query.EExecuteList(); } }