1

TradeManageNew/DD_OrderServiceNew.asmx.cs

@@ -28623,7 +28623,7 @@ namespace TradeManageNew
             {
                 where.Add(new RefParameter("a.SecondHandType", "=", SecondState, DbType.Int32));
             }
-            if (ScanState != "-1") where.Add(new RefParameter("isnull(a.ScanState,0)", "=", ScanState, DbType.String));
+            //if (ScanState != "-1") where.Add(new RefParameter("isnull(a.ScanState,0)", "=", ScanState, DbType.String));
             if (string.IsNullOrEmpty(trackcode) == false)
             {
                 where.Add(new RefParameter("(a.tracking_id", "=", trackcode, DbType.String));

TradeManageNew/DataNew.cs

@@ -7082,7 +7082,8 @@ end
 --set @OrderCode='1Z266E819066489986'
 declare @TrackCode  nvarchar(50),@OrderId int,@JoinOrderCode nvarchar(50),@TrackId int,@MateState int,@PrintState int,@State int,@OrderState int,@PostId int,@DetailId int,@num int,@OldPostionCode nvarchar(50),@PostInfo nvarchar(50)
 set @OrderId=0
-select top 1  @TrackCode=a.tracking_id,@PostInfo=return_carrier,@PostId=0,@OrderId=a.OrderId,@OrderCode=b.PlatOrderCode,@JoinOrderCode=JoinOrderCode,@PrintState=PrintState,@MateState=MateState,@State=b.State,@TrackId=a.Id,@OrderState=isnull(ScanState,0),@DetailId=a.DetailId,@num=a.return_quantity,@OldPostionCode=a.OldPostionCode from DT_OrderReturn a
+select top 1  @TrackCode=a.tracking_id,@PostInfo=return_carrier,@PostId=0,@OrderId=a.OrderId,@OrderCode=b.PlatOrderCode,@JoinOrderCode=JoinOrderCode,@PrintState=PrintState,@MateState=MateState,@State=b.State,@TrackId=a.Id,@OrderState=isnull(ScanState,0),@DetailId=a.DetailId,@num=a.return_quantity,@OldPostionCode=a.OldPostionCode 
+from DT_OrderReturn a
 inner join DT_OrderInfo b on a.OrderId=b.OrderId
  where isnull(a.ScanState,0)=0 and (tracking_id=@OrderCode or tracking_id=@OrderCode1 or tracking_id=@OrderCode2 or tracking_id=@OrderCode3 or tracking_id=@OrderCode4 or tracking_id=@OrderCode5)  order by Id desc
 
@@ -25277,7 +25278,7 @@ GROUP BY
 
         public static DT_OrderReturn GetDT_OrderReturnByTrackId(string code,string code2)
         {
-            var sql = @" select top 1 * from DT_OrderReturn where (tracking_id=@code or tracking_id=@code2) and return_request_date >'2025-02-05 12:00:00.000'";
+            var sql = @" select top 1 * from DT_OrderReturn where tracking_id=@code or tracking_id=@code2  ";
 
             Database db = DatabaseFactory.CreateDatabase();
             DbCommand cmd = db.GetSqlStringCommand(sql);