antissoft / lvqianmeiye_ERP

Commit 50867d2a2feee3c5ed7a8c08f87202821959260f

Authored by “wangming”
1 parent e04380b9

更新消耗相关服务和DTO 

- 更新LqXhHyhkService服务
- 更新ConsumeItemDetailListOutput DTO
- 更新开发环境配置
Inline Side-by-side
Showing 3 changed files with 47 additions and 3 deletions
antis-ncc-admin/.env.development
  View file @50867d2
... ... @@ -2,8 +2,8 @@
2 2  
3 3 VUE_CLI_BABEL_TRANSPILE_MODULES = true
4 4 # VUE_APP_BASE_API = 'https://erp.lvqianmeiye.com'
5   -VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
6   -# VUE_APP_BASE_API = 'http://localhost:2011'
  5 +# VUE_APP_BASE_API = 'http://erp_test.lvqianmeiye.com'
  6 +VUE_APP_BASE_API = 'http://localhost:2011'
7 7 # VUE_APP_BASE_API = 'http://localhost:2011'
8 8 VUE_APP_IMG_API = ''
9 9 VUE_APP_BASE_WSS = 'ws://192.168.110.45:2011/websocket'
... ...
netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/LqXhPxmx/ConsumeItemDetailListOutput.cs
  View file @50867d2
1 1 using System;
  2 +using System.Collections.Generic;
  3 +using NCC.Extend.Entitys.Dto.LqXhJksyj;
2 4  
3 5 namespace NCC.Extend.Entitys.Dto.LqXhPxmx
4 6 {
... ... @@ -76,6 +78,11 @@ namespace NCC.Extend.Entitys.Dto.LqXhPxmx
76 78 /// 门店名称
77 79 /// </summary>
78 80 public string storeName { get; set; }
  81 +
  82 + /// <summary>
  83 + /// 健康师业绩列表
  84 + /// </summary>
  85 + public List<LqXhJksyjInfoOutput> lqXhJksyjList { get; set; }
79 86 }
80 87 }
81 88  
... ...
netcore/src/Modularity/Extend/NCC.Extend/LqXhHyhkService.cs
  View file @50867d2
... ... @@ -1983,6 +1983,7 @@ namespace NCC.Extend.LqXhHyhk
1983 1983 /// - sourceType: 来源类型（字符串，如：购买、赠送、体验）
1984 1984 /// - storeId: 门店ID（关联耗卡记录表的门店ID）
1985 1985 /// - storeName: 门店名称（关联门店表的店名字段）
  1986 + /// - lqXhJksyjList: 健康师业绩列表（关联健康师业绩表，通过F_kdpxid关联品项明细ID）
1986 1987 /// </remarks>
1987 1988 /// <param name="input">查询参数</param>
1988 1989 /// <returns>耗卡品项明细记录列表（分页）</returns>
... ... @@ -2094,6 +2095,41 @@ namespace NCC.Extend.LqXhHyhk
2094 2095 storeDict = stores.ToDictionary(x => x.Id, x => x.Dm ?? "");
2095 2096 }
2096 2097  
  2098 + // 批量查询健康师业绩信息（通过 F_kdpxid 关联到品项明细ID）
  2099 + var jksyjDict = new Dictionary<string, List<LqXhJksyjInfoOutput>>();
  2100 + if (itemIds.Any())
  2101 + {
  2102 + var jksyjEntities = await _db.Queryable<LqXhJksyjEntity>()
  2103 + .Where(x => itemIds.Contains(x.Kdpxid) && x.IsEffective == StatusEnum.有效.GetHashCode())
  2104 + .ToListAsync();
  2105 +
  2106 + var jksyjList = jksyjEntities.Select(x => new LqXhJksyjInfoOutput
  2107 + {
  2108 + id = x.Id,
  2109 + glkdbh = x.Glkdbh,
  2110 + jks = x.Jks,
  2111 + jksxm = x.Jksxm,
  2112 + jkszh = x.Jkszh,
  2113 + jksyj = x.Jksyj?.ToString() ?? "0",
  2114 + yjsj = x.Yjsj,
  2115 + jsjId = x.JsjId,
  2116 + kdpxid = x.Kdpxid,
  2117 + laborCost = x.LaborCost,
  2118 + kdpxNumber = x.KdpxNumber,
  2119 + originalKdpxNumber = x.OriginalKdpxNumber,
  2120 + overtimeKdpxNumber = x.OvertimeKdpxNumber,
  2121 + originalLaborCost = x.OriginalLaborCost,
  2122 + overtimeLaborCost = x.OvertimeLaborCost,
  2123 + isAccompanied = x.IsAccompanied,
  2124 + accompaniedProjectNumber = x.AccompaniedProjectNumber
  2125 + }).ToList();
  2126 +
  2127 + jksyjDict = jksyjList
  2128 + .Where(x => !string.IsNullOrEmpty(x.kdpxid))
  2129 + .GroupBy(x => x.kdpxid)
  2130 + .ToDictionary(g => g.Key, g => g.ToList());
  2131 + }
  2132 +
2097 2133 // 5. 组装返回数据
2098 2134 var resultList = pagedData.list.Select(pxmx => new ConsumeItemDetailListOutput
2099 2135 {
... ... @@ -2110,7 +2146,8 @@ namespace NCC.Extend.LqXhHyhk
2110 2146 totalPrice = pxmx.TotalPrice,
2111 2147 sourceType = pxmx.SourceType,
2112 2148 storeId = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) ? consumeDict[pxmx.ConsumeInfoId].StoreId : "",
2113   - storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : ""
  2149 + storeName = pxmx.ConsumeInfoId != null && consumeDict.ContainsKey(pxmx.ConsumeInfoId) && !string.IsNullOrEmpty(consumeDict[pxmx.ConsumeInfoId].StoreId) && storeDict.ContainsKey(consumeDict[pxmx.ConsumeInfoId].StoreId) ? storeDict[consumeDict[pxmx.ConsumeInfoId].StoreId] : "",
  2150 + lqXhJksyjList = jksyjDict.ContainsKey(pxmx.Id) ? jksyjDict[pxmx.Id] : new List<LqXhJksyjInfoOutput>()
2114 2151 }).ToList();
2115 2152  
2116 2153 // 6. 返回分页结果
... ...