Browse Source

未上传到B3 也支持审核,删除单据,相应删除审核记录。

master
yibo 8 years ago
parent
commit
8086e98f03
3 changed files with 16 additions and 8 deletions
  1. +9
    -5
      B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs
  2. +6
    -2
      B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs
  3. +1
    -1
      B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs

+ 9
- 5
B3ClientService/BO/Bill/WeightBill/WeightBillCheck.cs View File

@ -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; }
/// <summary>
/// 单据创建人用户名
@ -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();
}
}


+ 6
- 2
B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs View File

@ -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;
}
}


+ 1
- 1
B3ClientService/Tasks/UpdateLoad/DoCheckBills.cs View File

@ -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<long, string>();
}
}


Loading…
Cancel
Save