|
|
|
@ -40,6 +40,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc |
|
|
|
query.Columns.Add(DQSelectColumn.Field("Number", detail)); |
|
|
|
query.Columns.Add(DQSelectColumn.Field("Weight", detail)); |
|
|
|
query.Columns.Add(DQSelectColumn.Create(DQExpression.LogicCase(DQCondition.And(DQCondition.IsNotNull(DQExpression.Field(detail, "PiWeight")), DQCondition.IsNotNull(DQExpression.Field(detail, "MaoWeight"))), DQExpression.Value(1), DQExpression.Value(0)), "FinishWeight")); |
|
|
|
query.Columns.Add(DQSelectColumn.Field("PrintNumber")); |
|
|
|
query.Where.Conditions.Add(DQCondition.And(DQCondition.Between("WeighTime", date, date + new TimeSpan(23, 59, 29)), DQCondition.EQ("DeleteState", false))); |
|
|
|
if (carID.HasValue) |
|
|
|
query.Where.Conditions.Add(DQCondition.EQ("Car_ID", carID)); |
|
|
|
@ -65,6 +66,7 @@ namespace BWP.B3ClientService.Rpcs.BillRpc |
|
|
|
entity.Number = (int?)reader[9]; |
|
|
|
entity.Weight = (decimal?)reader[10]; |
|
|
|
entity.FinishWeight = Convert.ToBoolean(reader[11]); |
|
|
|
entity.PrintNumber = (int)reader[12]; |
|
|
|
list.Add(entity); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -145,13 +147,14 @@ namespace BWP.B3ClientService.Rpcs.BillRpc |
|
|
|
|
|
|
|
static void FillServerUpdateFields(IDmoSession session, WeightBill dmo) |
|
|
|
{ |
|
|
|
var min = InnerBLUtil.GetSingleDmo<WeightBill>(session, "ID", dmo.ID, "B3ID", "DeleteState", "Inspector_ID", "Inspector_Name", "HouseNames", "SanctionMoney"); |
|
|
|
var min = InnerBLUtil.GetSingleDmo<WeightBill>(session, "ID", dmo.ID, "B3ID", "DeleteState", "Inspector_ID", "Inspector_Name", "HouseNames", "SanctionMoney", "PrintNumber"); |
|
|
|
dmo.B3ID = min.B3ID; |
|
|
|
dmo.DeleteState = min.DeleteState; |
|
|
|
dmo.Inspector_ID = min.Inspector_ID; |
|
|
|
dmo.Inspector_Name = min.Inspector_Name; |
|
|
|
dmo.HouseNames = min.HouseNames; |
|
|
|
dmo.SanctionMoney = min.SanctionMoney; |
|
|
|
dmo.PrintNumber = min.PrintNumber; |
|
|
|
dmo.Sync = false; |
|
|
|
dmo.ModifyTime = DateTime.Now; |
|
|
|
} |
|
|
|
@ -309,6 +312,11 @@ namespace BWP.B3ClientService.Rpcs.BillRpc |
|
|
|
[Rpc] |
|
|
|
public static int DoCheck(long id, string creator) |
|
|
|
{ |
|
|
|
var update = new DQUpdateDom(typeof(WeightBill)); |
|
|
|
update.Where.Conditions.Add(DQCondition.EQ("ID", id)); |
|
|
|
update.Columns.Add(new DQUpdateColumn("PrintNumber", DQExpression.Add(DQExpression.Field("PrintNumber"), DQExpression.Value(1)))); |
|
|
|
update.EExecute(); |
|
|
|
|
|
|
|
WeightBillCheck.Insert(id, creator); |
|
|
|
return 1; |
|
|
|
} |
|
|
|
|