diff --git a/B3ClientService/BO/Bill/SegmentProductionInfo.cs b/B3ClientService/BO/Bill/SegmentProductionInfo.cs index f7c0303..1c4006d 100644 --- a/B3ClientService/BO/Bill/SegmentProductionInfo.cs +++ b/B3ClientService/BO/Bill/SegmentProductionInfo.cs @@ -69,6 +69,9 @@ namespace BWP.B3ClientService.BO [LogicName("仓库")] public long? Store_ID { get; set; } + + [LogicName("入库操作员")] + public long? InStoreWorker_ID { get; set; } #endregion #region 退库信息 @@ -136,5 +139,9 @@ namespace BWP.B3ClientService.BO [ReferenceTo(typeof(ProductBatch), "Name")] [Join("ProductBatch_ID", "ID")] public string ProductBatch_Name { get; set; } + + [ReferenceTo(typeof(Worker), "Name")] + [Join("InStoreWorker_ID", "ID")] + public string InStoreWorker_Name { get; set; } } } diff --git a/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs index 2ad9705..3db93a7 100644 --- a/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs +++ b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs @@ -34,6 +34,7 @@ namespace BWP.B3ClientService.Rpcs if (id == null) { var entity = new SegmentProductionInfo(); + entity.InStoreWorker_ID = item.Worker_ID; entity.BarCode = item.BarCode; entity.InStoreTime = item.InStoreTime; entity.BackTime = item.BackStoreTime; @@ -59,6 +60,7 @@ namespace BWP.B3ClientService.Rpcs private static void Update(IDmoSession session, long id, SegmentInStoreObj entity) { var update = new DQUpdateDom(typeof(SegmentProductionInfo)); + update.Columns.Add(new DQUpdateColumn("InStoreWorker_ID", entity.Worker_ID)); update.Columns.Add(new DQUpdateColumn("InStoreTime", entity.InStoreTime)); update.Columns.Add(new DQUpdateColumn("Store_ID", entity.Store_ID)); update.Columns.Add(new DQUpdateColumn("BackTime", DQExpression.Value(entity.BackStoreTime))); @@ -169,6 +171,7 @@ namespace BWP.B3ClientService.Rpcs public long? Store_ID { get; set; } public DateTime? BackStoreTime { get; set; } + public long? Worker_ID { get; set; } } class SegmentProductObj diff --git a/B3ClientService/Tasks/UpdateLoad/UploadProductInStore.cs b/B3ClientService/Tasks/UpdateLoad/UploadProductInStore.cs index 216f0f7..e2ff710 100644 --- a/B3ClientService/Tasks/UpdateLoad/UploadProductInStore.cs +++ b/B3ClientService/Tasks/UpdateLoad/UploadProductInStore.cs @@ -47,12 +47,13 @@ namespace BWP.B3ClientService.Tasks { var arr = GetArrList(item.Item1, item.Item2); var summary = new List(); - foreach (var g in arr.GroupBy(x => new { x.ProductBatch, x.StoreCode, x.Goods_Code })) + foreach (var g in arr.GroupBy(x => new { x.ProductBatch, x.StoreCode, x.Goods_Code, x.Worker_Name })) { var detail = new ProductInStoreJson(); detail.ProductBatch = g.Key.ProductBatch; detail.StoreCode = g.Key.StoreCode; detail.Goods_Code = g.Key.Goods_Code; + detail.Worker_Name = g.Key.Worker_Name; detail.Number = g.Sum(x => x.Number ?? 0); detail.SecondNumber = g.Sum(x => x.SecondNumber ?? 0); summary.Add(detail); @@ -94,6 +95,7 @@ namespace BWP.B3ClientService.Tasks query.Columns.Add(DQSelectColumn.Field("Weight")); query.Columns.Add(DQSelectColumn.Field("RowVersion")); query.Columns.Add(DQSelectColumn.Field("ID")); + query.Columns.Add(DQSelectColumn.Field("InStoreWorker_Name")); var list = new List(); using (var session = Dmo.NewSession()) { @@ -110,6 +112,7 @@ namespace BWP.B3ClientService.Tasks detail.SecondNumber = need * 1; detail.RowVersion = (int)reader[5]; detail.ID = (long)reader[6]; + detail.Worker_Name = (string)reader[7]; list.Add(detail); } } @@ -142,6 +145,8 @@ namespace BWP.B3ClientService.Tasks public decimal? SecondNumber { get; set; } + public string Worker_Name { get; set; } + [JsonIgnore] public int RowVersion { get; set; }