出库导出增加单号

Property.Model/Extend/Mall/RB_WarehouseOut_GoodsDetail_Extend.cs

+using Property.Model.Entity.Mall;
+using REBORN.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Property.Model.Extend.Mall
+{
+    /// <summary>
+    /// 商品出库申请扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "PropertyConnection")]
+    public class RB_WarehouseOut_GoodsDetail_Extend : RB_WarehouseOut_GoodsDetail
+    {
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+    }
+}

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -14,6 +14,7 @@ using Property.Repository.Supplies;
 using Property.Model.Extend.Supplies;
 using Newtonsoft.Json.Linq;
 using REBORN.Common.API;
+using Property.Repository.Mall;
 
 namespace Property.Module.FixedAssets
 {
@@ -98,6 +99,10 @@ namespace Property.Module.FixedAssets
         private readonly Rb_Workflow_AuditrecordRepository workflow_AuditrecordRepository = new Rb_Workflow_AuditrecordRepository();
         private readonly Rb_Workflow_AuditRelevanceRepository workflow_AuditRelevanceRepository = new Rb_Workflow_AuditRelevanceRepository();
         private readonly RB_Workfolw_Change_LogRepository workfolw_Change_LogRepository = new RB_Workfolw_Change_LogRepository();
+        /// <summary>
+        /// 出库审核
+        /// </summary>
+        private readonly RB_WarehouseOut_GoodsDetailRepository warehouseOutGoodsDetailRepository = new RB_WarehouseOut_GoodsDetailRepository();
 
         //流程模板
         private readonly WorkFlowModule workFlowModule = new WorkFlowModule();
@@ -881,6 +886,16 @@ namespace Property.Module.FixedAssets
             }
         }
 
+        /// <summary>
+        /// 根据出库id  获取订单号
+        /// </summary>
+        /// <param name="stockOutIds"></param>
+        /// <returns></returns>
+        public List<Model.Extend.Mall.RB_WarehouseOut_GoodsDetail_Extend> GetStockOutOrderNoList(string stockOutIds)
+        {
+            return warehouseOutGoodsDetailRepository.GetStockOutOrderNoList(stockOutIds);
+        }
+
         /// <summary>
         /// 领用统计
         /// </summary>

Property.Repository/Mall/RB_WarehouseOut_GoodsDetailRepository.cs

@@ -109,5 +109,18 @@ namespace Property.Repository.Mall
             }
             return Get<RB_WarehouseOut_GoodsDetail>(builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 根据出库id  获取订单号
+        /// </summary>
+        /// <param name="stockOutIds"></param>
+        /// <returns></returns>
+        public List<RB_WarehouseOut_GoodsDetail_Extend> GetStockOutOrderNoList(string stockOutIds)
+        {
+            string sql = $@"SELECT DISTINCT gd.MaterialId,gd.StockOutId,gd.OrderId,g.OrderNo FROM rb_warehouseout_goodsdetail gd
+LEFT JOIN rb_warehouseout_goods g on gd.OrderGoodsId = g.OrderGoodsId
+WHERE gd.TenantId =1 and gd.MallBaseId =1 AND gd.`Status` =0 AND g.`Status`=0 AND g.IsOut =1 AND gd.StockOutId in ({stockOutIds})";
+            return Get<RB_WarehouseOut_GoodsDetail_Extend>(sql).ToList();
+        }
     }
 }

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -711,6 +711,7 @@ namespace Property.WebApi.Controllers.User
                             new ExcelColumn(value:"品牌"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"库存"){CellWidth=20,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                             new ExcelColumn(value:"数量"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            new ExcelColumn(value:"关联订单"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                          },
             };
             slist.Add(header);
@@ -718,7 +719,12 @@ namespace Property.WebApi.Controllers.User
             {
                 demodel.RB_Group_Id = userInfo.RB_Group_id;
                 List<RB_Supplies_StockOut_Extend> list = suppliesModule.GetStockOutPageList(1, 99999, demodel, out long count);
-
+                List<Model.Extend.Mall.RB_WarehouseOut_GoodsDetail_Extend> orderList = new List<Model.Extend.Mall.RB_WarehouseOut_GoodsDetail_Extend>();
+                if (list.Any()) {
+                    //查询对应的订单号
+                    string StockOutIds = string.Join(",", list.Select(x => x.Id));
+                    orderList = suppliesModule.GetStockOutOrderNoList(StockOutIds);
+                }
                 #region 组装数据
                 int Num = 1;
                 foreach (var item in list)
@@ -726,6 +732,13 @@ namespace Property.WebApi.Controllers.User
                     Num = 1;
                     foreach (var citem in item.DetailList)
                     {
+                        string OrderNo = "";
+                        foreach (var qqitem in orderList.Where(x => x.MaterialId == citem.SuppliesId && x.StockOutId == item.Id)) {
+                            OrderNo += qqitem.OrderNo + "(" + qqitem.OrderId + ")" + ",";
+                        }
+                        if (!string.IsNullOrEmpty(OrderNo)) {
+                            OrderNo = OrderNo[0..^1];
+                        }
                         int Count = item.DetailList.Count();
                         if (Num == 1)
                         {
@@ -741,7 +754,8 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:citem.CategoryName){ },
                                     new ExcelColumn(value:citem.BrandName){ },
                                     new ExcelColumn(value:(citem.InventoryNum??0).ToString()){ },
-                                    new ExcelColumn(value:(citem.Number??0).ToString())
+                                    new ExcelColumn(value:(citem.Number??0).ToString()),
+                                    new ExcelColumn(value:OrderNo),
                                 }
                             };
                             slist.Add(datarow);
@@ -760,7 +774,8 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:citem.CategoryName){ },
                                     new ExcelColumn(value:citem.BrandName){ },
                                     new ExcelColumn(value:(citem.InventoryNum??0).ToString()){ },
-                                    new ExcelColumn(value:(citem.Number??0).ToString())
+                                    new ExcelColumn(value:(citem.Number??0).ToString()),
+                                    new ExcelColumn(value:OrderNo),
                                 }
                             };
                             slist.Add(datarow);