Browse Source

白条发货调整。

master
yibo 7 years ago
parent
commit
c9db6408fd
5 changed files with 12 additions and 0 deletions
  1. +4
    -0
      B3ClientService/BO/Bill/CarcassFullInfo.cs
  2. +2
    -0
      B3ClientService/BO/Bill/SectionStore/SectionStoreDetail.cs
  3. +3
    -0
      B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs
  4. +2
    -0
      B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs
  5. +1
    -0
      B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs

+ 4
- 0
B3ClientService/BO/Bill/CarcassFullInfo.cs View File

@ -102,6 +102,10 @@ namespace BWP.B3ClientService.BO
[LogicName("领用重量")] [LogicName("领用重量")]
public decimal? PickWeight { get; set; } public decimal? PickWeight { get; set; }
[LogicName("领用头数")]//0.5或1
[DbColumn(DefaultValue = 1)]
public decimal? PickNumber { get; set; }
[LogicName("领用组标识")] [LogicName("领用组标识")]
public long? PickGroupID { get; set; } public long? PickGroupID { get; set; }


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

@ -29,6 +29,8 @@ namespace BWP.B3ClientService.BO
public NamedValue<>? PickType { get; set; } public NamedValue<>? PickType { get; set; }
public decimal? PickNumber { get; set; }
public long Worker_ID { get; set; } public long Worker_ID { get; set; }
public bool TakeOutCreate { get; set; } public bool TakeOutCreate { get; set; }


+ 3
- 0
B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs View File

@ -58,6 +58,7 @@ namespace BWP.B3ClientService.Rpcs
update.Columns.Add(new DQUpdateColumn("SaleGoods_ID", goodsID)); update.Columns.Add(new DQUpdateColumn("SaleGoods_ID", goodsID));
update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight)); update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight));
update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time)); update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time));
update.Columns.Add(new DQUpdateColumn("PickNumber", obj.Number));
if (obj.ProductBatch_ID.HasValue) if (obj.ProductBatch_ID.HasValue)
update.Columns.Add(new DQUpdateColumn("ProductBatch_ID", obj.ProductBatch_ID)); update.Columns.Add(new DQUpdateColumn("ProductBatch_ID", obj.ProductBatch_ID));
update.Columns.Add(new DQUpdateColumn("PickType", .)); update.Columns.Add(new DQUpdateColumn("PickType", .));
@ -96,6 +97,7 @@ namespace BWP.B3ClientService.Rpcs
update.Columns.Add(new DQUpdateColumn("Weight", item.Weight)); update.Columns.Add(new DQUpdateColumn("Weight", item.Weight));
update.Columns.Add(new DQUpdateColumn("OutStoreTime", item.Time)); update.Columns.Add(new DQUpdateColumn("OutStoreTime", item.Time));
update.Columns.Add(new DQUpdateColumn("PickType", .)); update.Columns.Add(new DQUpdateColumn("PickType", .));
update.Columns.Add(new DQUpdateColumn("PickNumber", item.Number));
update.Where.Conditions.Add(DQCondition.EQ("BarCode", item.BarCode)); update.Where.Conditions.Add(DQCondition.EQ("BarCode", item.BarCode));
session.ExecuteNonQuery(update); session.ExecuteNonQuery(update);
} }
@ -129,6 +131,7 @@ namespace BWP.B3ClientService.Rpcs
public DateTime? Time { get; set; } public DateTime? Time { get; set; }
public string SaleGoods_Code { get; set; } public string SaleGoods_Code { get; set; }
public long? ProductBatch_ID { get; set; } public long? ProductBatch_ID { get; set; }
public decimal? Number { get; set; }
} }
class MinCarcassSaleOutObj class MinCarcassSaleOutObj


+ 2
- 0
B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs View File

@ -53,6 +53,7 @@ namespace BWP.B3ClientService.Rpcs
update.Columns.Add(new DQUpdateColumn("PickGroupID", obj.GroupID)); update.Columns.Add(new DQUpdateColumn("PickGroupID", obj.GroupID));
update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight)); update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight));
update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time)); update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time));
update.Columns.Add(new DQUpdateColumn("PickNumber", 1));
update.Columns.Add(new DQUpdateColumn("PickType", .)); update.Columns.Add(new DQUpdateColumn("PickType", .));
update.Where.Conditions.Add(DQCondition.EQ("ID", id)); update.Where.Conditions.Add(DQCondition.EQ("ID", id));
session.ExecuteNonQuery(update); session.ExecuteNonQuery(update);
@ -67,6 +68,7 @@ namespace BWP.B3ClientService.Rpcs
entity.PickWeight = obj.Weight; entity.PickWeight = obj.Weight;
entity.PickGroupID = obj.GroupID; entity.PickGroupID = obj.GroupID;
entity.PickTime = obj.Time; entity.PickTime = obj.Time;
entity.PickNumber = 1;
entity.PickType = .; entity.PickType = .;
if (string.IsNullOrEmpty(entity.BarCode)) if (string.IsNullOrEmpty(entity.BarCode))
{ {


+ 1
- 0
B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs View File

@ -135,6 +135,7 @@ namespace BWP.B3ClientService.Rpcs
entity.InStoreTime = item.Time.Value; entity.InStoreTime = item.Time.Value;
entity.OutStoreTime = entity.InStoreTime; entity.OutStoreTime = entity.InStoreTime;
entity.PickType = .; entity.PickType = .;
entity.PickNumber = 1;
entity.ProductBatch_ID = item.ProductBatch_ID; entity.ProductBatch_ID = item.ProductBatch_ID;
entity.TakeOutCreate = true; entity.TakeOutCreate = true;
entity.Weight = item.Weight; entity.Weight = item.Weight;


Loading…
Cancel
Save