diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
index 5717ea4..d98491f 100644
--- a/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
+++ b/Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs
@@ -50,12 +50,11 @@ GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode], [s
///
public List GetPushReturnOrder()
{
- string sql = $@"
- SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],
+ string sql = $@" SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],
[status], CONVERT(NVARCHAR(30),[consignTime],23) [consignTime],
[goodsNo], [goodsId],SUM([sellTotal]*-1) [sellTotal],
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)
LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK)
ON a.id = b.JackOrdersId