From 0796ca6cca98990ad08bec05a3d2aa5a0e913862 Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Thu, 6 Feb 2025 10:29:01 +0800 Subject: [PATCH] 1 --- TradeManageNew/DD_OrderServiceNew.asmx.cs | 2 +- TradeManageNew/DataNew.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index 23aea08..64f985c 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/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)); diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index 85e8e1f..5d4e529 100644 --- a/TradeManageNew/DataNew.cs +++ b/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);