调整

Property.Model/Extend/Mall/RB_WarehouseOut_GoodsDetail_Extend.cs

@@ -17,5 +17,10 @@ namespace Property.Model.Extend.Mall
         /// 订单号
         /// </summary>
         public string OrderNo { get; set; }
+
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int FinanceId { get; set; }
     }
 }

Property.Repository/Mall/RB_WarehouseOut_GoodsDetailRepository.cs

@@ -117,8 +117,9 @@ namespace Property.Repository.Mall
         /// <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
+            string sql = $@"SELECT DISTINCT gd.MaterialId,gd.StockOutId,gd.OrderId,g.OrderNo,c.FinanceId FROM rb_warehouseout_goodsdetail gd
 LEFT JOIN rb_warehouseout_goods g on gd.OrderGoodsId = g.OrderGoodsId
+LEFT JOIN rb_warehouseout_finance as c on gd.ApplyId=c.ApplyId
 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

@@ -365,6 +365,7 @@ namespace Property.WebApi.Controllers.User
                             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 },
+                            new ExcelColumn(value:"采购单据"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                          },
             };
             slist.Add(header);
@@ -397,7 +398,8 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:citem.BrandName){ },
                                     new ExcelColumn(value:(citem.UnitPrice??0).ToString()){ },
                                     new ExcelColumn(value:(citem.Money??0).ToString()){ },
-                                    new ExcelColumn(value:(citem.Number??0).ToString())
+                                    new ExcelColumn(value:(citem.Number??0).ToString()),
+                                    new ExcelColumn(value:(item.FinanceId??0).ToString()){ Rowspan=Count},
                                 }
                             };
                             slist.Add(datarow);
@@ -418,7 +420,8 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:citem.BrandName){ },
                                     new ExcelColumn(value:(citem.UnitPrice??0).ToString()){ },
                                     new ExcelColumn(value:(citem.Money??0).ToString()){ },
-                                    new ExcelColumn(value:(citem.Number??0).ToString())
+                                    new ExcelColumn(value:(citem.Number??0).ToString()),
+                                    new ExcelColumn(value:""){ },
                                 }
                             };
                             slist.Add(datarow);
@@ -702,16 +705,17 @@ namespace Property.WebApi.Controllers.User
             {
                 ExcelRows = new List<ExcelColumn>(30) {
                             new ExcelColumn(value:"出库状态"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                            new ExcelColumn(value:"出库编码"){CellWidth=15,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 },
                             new ExcelColumn(value:"耗材编码"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                            new ExcelColumn(value:"耗材名称"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                            new ExcelColumn(value:"分类名称"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
-                            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=25,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 },
+                            new ExcelColumn(value:"库存"){CellWidth=15,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 },
+                            new ExcelColumn(value:"关联订单"){CellWidth=25,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
+                            new ExcelColumn(value:"关联单据"){CellWidth=15,HAlignmentEnum= HAlignmentEnum.CENTER,VAlignmentEnum= VAlignmentEnum.CENTER },
                          },
             };
             slist.Add(header);
@@ -733,12 +737,15 @@ namespace Property.WebApi.Controllers.User
                     foreach (var citem in item.DetailList)
                     {
                         string OrderNo = "";
+                        List<int> FinanceIdList = new List<int>();
                         foreach (var qqitem in orderList.Where(x => x.MaterialId == citem.SuppliesId && x.StockOutId == item.Id)) {
                             OrderNo += qqitem.OrderNo + "(" + qqitem.OrderId + ")" + ",";
+                            FinanceIdList.Add(qqitem.FinanceId);
                         }
                         if (!string.IsNullOrEmpty(OrderNo)) {
                             OrderNo = OrderNo[0..^1];
                         }
+                        string FinanceIds = string.Join(",", FinanceIdList.Distinct());
                         int Count = item.DetailList.Count();
                         if (Num == 1)
                         {
@@ -756,6 +763,7 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:(citem.InventoryNum??0).ToString()){ },
                                     new ExcelColumn(value:(citem.Number??0).ToString()),
                                     new ExcelColumn(value:OrderNo),
+                                    new ExcelColumn(value:FinanceIds),
                                 }
                             };
                             slist.Add(datarow);
@@ -776,6 +784,7 @@ namespace Property.WebApi.Controllers.User
                                     new ExcelColumn(value:(citem.InventoryNum??0).ToString()){ },
                                     new ExcelColumn(value:(citem.Number??0).ToString()),
                                     new ExcelColumn(value:OrderNo),
+                                    new ExcelColumn(value:FinanceIds),
                                 }
                             };
                             slist.Add(datarow);