From 9a1e207f2210342bcc9418ff21069c3a81f38f4e Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 25 Dec 2018 09:00:17 +0800 Subject: [PATCH] . --- .../BO/ProductInStoreCombine_/ProductInStoreCombine.cs | 6 ++++++ B3ClientService/Tasks/InStoreCombineCreateB3Bills.cs | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/B3ClientService/BO/ProductInStoreCombine_/ProductInStoreCombine.cs b/B3ClientService/BO/ProductInStoreCombine_/ProductInStoreCombine.cs index e221b6a..2bf0f41 100644 --- a/B3ClientService/BO/ProductInStoreCombine_/ProductInStoreCombine.cs +++ b/B3ClientService/BO/ProductInStoreCombine_/ProductInStoreCombine.cs @@ -11,6 +11,12 @@ namespace BWP.B3ClientService.BO [DFClass, Serializable] public class ProductInStoreCombine : Base { + public long Worker_ID { get; set; } + + [ReferenceTo(typeof(Worker), "Name")] + [Join("Worker_ID", "ID")] + public string Worker_Name { get; set; } + public string CombineCode { get; set; } public long OutStore_ID { get; set; } diff --git a/B3ClientService/Tasks/InStoreCombineCreateB3Bills.cs b/B3ClientService/Tasks/InStoreCombineCreateB3Bills.cs index 6c38f68..5fcf0b6 100644 --- a/B3ClientService/Tasks/InStoreCombineCreateB3Bills.cs +++ b/B3ClientService/Tasks/InStoreCombineCreateB3Bills.cs @@ -85,6 +85,7 @@ namespace BWP.B3ClientService.Tasks query.Columns.Add(DQSelectColumn.Field("OutStore_Code")); query.Columns.Add(DQSelectColumn.Field("InStore_Code")); query.Columns.Add(DQSelectColumn.Field("Goods_Code", detail)); + query.Columns.Add(DQSelectColumn.Field("Worker_Name")); foreach (var c in query.Columns) query.GroupBy.Expressions.Add(c.Expression); query.Columns.Add(DQSelectColumn.Sum("Weight")); @@ -107,8 +108,9 @@ namespace BWP.B3ClientService.Tasks OutStore_Code = (string)reader[2], InStore_Code = (string)reader[3], Goods_Code = (string)reader[4], - Weight = (decimal)reader[5], - Count = Convert.ToInt32(reader[6]) + Worker_Name = (string)reader[5], + Weight = (decimal)reader[6], + Count = Convert.ToInt32(reader[7]) }); } }