Browse Source

加打印次数。

master
yibo 8 years ago
parent
commit
e752c5a6c8
3 changed files with 13 additions and 1 deletions
  1. +2
    -0
      B3ClientService/BO/Bill/WeightBill/WeightBill.cs
  2. +2
    -0
      B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs
  3. +9
    -1
      B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs

+ 2
- 0
B3ClientService/BO/Bill/WeightBill/WeightBill.cs View File

@ -15,6 +15,8 @@ namespace BWP.B3ClientService.BO
public int RowVersion { get; set; } public int RowVersion { get; set; }
#region BasicFile #region BasicFile
public int PrintNumber { get; set; }
public long? AccountingUnit_ID { get; set; } public long? AccountingUnit_ID { get; set; }
public long? Department_ID { get; set; } public long? Department_ID { get; set; }


+ 2
- 0
B3ClientService/ClientSerializerBo/WeightBill/WeightBillList.cs View File

@ -30,5 +30,7 @@ namespace BWP.B3ClientService
public string Remark { get; set; } public string Remark { get; set; }
public bool FinishWeight { get; set; } public bool FinishWeight { get; set; }
public int PrintNumber { get; set; }
} }
} }

+ 9
- 1
B3ClientService/Rpcs/BillRpc/WeightBillRpc.cs View File

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


Loading…
Cancel
Save