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

Compare commits

base: Develop:74784620a9f58eb8f972a493d9d7deeb3e6e685a
Branches Tags
Develop:master Develop:BaoMaKu Develop:jackYun Develop:YanShi
...
compare: Develop:9823f93bdca14076901dd6bdd9ae8309b729c209
Branches Tags
Develop:BaoMaKu Develop:jackYun Develop:YanShi Develop:master

2 Commits
74784620a9 ... 9823f93bdc

Author SHA1 Message Date
yuyubo
9823f93bdc Merge branch 'BaoMaKu' of http://8.130.121.29:3000/Develop/YunTongJackYunTask into BaoMaKu 2025-12-12 08:38:04 +08:00
yuyubo
676b5efa72 23 2025-12-12 08:37:26 +08:00
1 changed files with 2 additions and 3 deletions
Expand all files Collapse all files

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

@@ -50,12 +50,11 @@ GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [s
/// <returns></returns> /// <returns></returns>
public List<PushOrderListResp> GetPushReturnOrder() public List<PushOrderListResp> GetPushReturnOrder()
{ {
string sql = $@" string sql = $@" SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],
SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],
[status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime], [status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime],
[goodsNo], [goodsId],SUM([sellTotal]*-1) [sellTotal], [goodsNo], [goodsId],SUM([sellTotal]*-1) [sellTotal],
SUM([returnCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal], SUM([returnCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal],
[barcode], [TradeType] ,[warehouseId],Unit convert(nvarchar(100),barcode) as [barcode], [TradeType] ,convert(nvarchar(100),[warehouseId]) as [warehouseId],Unit
FROM [JackOrders] a WITH (NOLOCK) FROM [JackOrders] a WITH (NOLOCK)
LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK) LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK)
ON a.id = b.JackOrdersId ON a.id = b.JackOrdersId