diff --git a/B3ClientService/BO/Bill/CarcassFullInfo.cs b/B3ClientService/BO/Bill/CarcassFullInfo.cs index 809c4b3..7ac065e 100644 --- a/B3ClientService/BO/Bill/CarcassFullInfo.cs +++ b/B3ClientService/BO/Bill/CarcassFullInfo.cs @@ -102,6 +102,10 @@ namespace BWP.B3ClientService.BO [LogicName("领用重量")] public decimal? PickWeight { get; set; } + [LogicName("领用头数")]//0.5或1 + [DbColumn(DefaultValue = 1)] + public decimal? PickNumber { get; set; } + [LogicName("领用组标识")] public long? PickGroupID { get; set; } diff --git a/B3ClientService/BO/Bill/SectionStore/SectionStoreDetail.cs b/B3ClientService/BO/Bill/SectionStore/SectionStoreDetail.cs index 5b78b48..acf7026 100644 --- a/B3ClientService/BO/Bill/SectionStore/SectionStoreDetail.cs +++ b/B3ClientService/BO/Bill/SectionStore/SectionStoreDetail.cs @@ -29,6 +29,8 @@ namespace BWP.B3ClientService.BO public NamedValue<领用类型>? PickType { get; set; } + public decimal? PickNumber { get; set; } + public long Worker_ID { get; set; } public bool TakeOutCreate { get; set; } diff --git a/B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs b/B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs index 6001a0c..e157982 100644 --- a/B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs +++ b/B3ClientService/OfflinRpc/CarcassSaleOutStoreRpc.cs @@ -58,6 +58,7 @@ namespace BWP.B3ClientService.Rpcs update.Columns.Add(new DQUpdateColumn("SaleGoods_ID", goodsID)); update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight)); update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time)); + update.Columns.Add(new DQUpdateColumn("PickNumber", obj.Number)); if (obj.ProductBatch_ID.HasValue) update.Columns.Add(new DQUpdateColumn("ProductBatch_ID", obj.ProductBatch_ID)); 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("OutStoreTime", item.Time)); update.Columns.Add(new DQUpdateColumn("PickType", 领用类型.白条销售)); + update.Columns.Add(new DQUpdateColumn("PickNumber", item.Number)); update.Where.Conditions.Add(DQCondition.EQ("BarCode", item.BarCode)); session.ExecuteNonQuery(update); } @@ -129,6 +131,7 @@ namespace BWP.B3ClientService.Rpcs public DateTime? Time { get; set; } public string SaleGoods_Code { get; set; } public long? ProductBatch_ID { get; set; } + public decimal? Number { get; set; } } class MinCarcassSaleOutObj diff --git a/B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs b/B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs index ac715d4..513b7a9 100644 --- a/B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs +++ b/B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs @@ -53,6 +53,7 @@ namespace BWP.B3ClientService.Rpcs update.Columns.Add(new DQUpdateColumn("PickGroupID", obj.GroupID)); update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight)); update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time)); + update.Columns.Add(new DQUpdateColumn("PickNumber", 1)); update.Columns.Add(new DQUpdateColumn("PickType", 领用类型.分割领用)); update.Where.Conditions.Add(DQCondition.EQ("ID", id)); session.ExecuteNonQuery(update); @@ -67,6 +68,7 @@ namespace BWP.B3ClientService.Rpcs entity.PickWeight = obj.Weight; entity.PickGroupID = obj.GroupID; entity.PickTime = obj.Time; + entity.PickNumber = 1; entity.PickType = 领用类型.分割领用; if (string.IsNullOrEmpty(entity.BarCode)) { diff --git a/B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs b/B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs index da1a924..baa4326 100644 --- a/B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs +++ b/B3ClientService/OfflinRpc/SectionStoreDetailRpc.cs @@ -135,6 +135,7 @@ namespace BWP.B3ClientService.Rpcs entity.InStoreTime = item.Time.Value; entity.OutStoreTime = entity.InStoreTime; entity.PickType = 领用类型.分割领用; + entity.PickNumber = 1; entity.ProductBatch_ID = item.ProductBatch_ID; entity.TakeOutCreate = true; entity.Weight = item.Weight;