Develop/YunTongJackYunTask
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jackYun' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into jackYun

Browse Source
This commit is contained in:
朱斌
2025-07-22 10:54:00 +08:00
parent dee74cbf73 84eee2ef0f
commit ecd750ec06
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Reportapi/MyCode.Project.Infrastructure/JackYun/TradeFullinfogetResp.cs
View File

@@ -91,6 +91,14 @@ namespace MyCode.Project.Infrastructure.JackYun
/// ///
/// </summary> /// </summary>
public string skuImgUrl { get; set; } public string skuImgUrl { get; set; }
/// <summary>
/// Desc:计量单位
/// Default:
/// Nullable:True
/// </summary>
public string Unit { get; set; }
} }
public class TradesItem public class TradesItem

4
Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
View File

@@ -31,12 +31,12 @@ namespace MyCode.Project.Repositories
[status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime], [status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime],
[goodsNo], [goodsId],SUM([sellTotal]) [sellTotal], [goodsNo], [goodsId],SUM([sellTotal]) [sellTotal],
SUM([sellCount]) [sellCount], SUM([divideSellTotal]) AS [divideSellTotal], SUM([sellCount]) [sellCount], SUM([divideSellTotal]) AS [divideSellTotal],
[barcode], [TradeType] ,[warehouseId] [barcode], [TradeType] ,[warehouseId],Unit
FROM [JackOrders] a WITH (NOLOCK) FROM [JackOrders] a WITH (NOLOCK)
LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK) LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK)
ON a.id = b.JackOrdersId ON a.id = b.JackOrdersId
WHERE a.status = 0 WHERE a.status = 0
GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo], [goodsId], [barcode] ,[warehouseId], [TradeType];"; GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [status], CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo], [goodsId], [barcode] ,[warehouseId], [TradeType],Unit";
var list = this.SelectList<PushOrderListResp>(sql); var list = this.SelectList<PushOrderListResp>(sql);
return list; return list;
} }