From 2cc973e31d1a015e737715a511ce9e063e4adb8c Mon Sep 17 00:00:00 2001 From: chenwenkai <1084072318@qq.com> Date: Wed, 5 Feb 2025 11:50:59 +0800 Subject: [PATCH] =?UTF-8?q?xsx=20=E9=80=80=E8=B4=A7=E6=88=AA=E5=8F=96?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TradeManageNew/DataNew.cs | 11 ++++++----- TradeManageNew/OuterService/ShageService.ashx.cs | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index ddf4b41..0776047 100644 --- a/TradeManageNew/DataNew.cs +++ b/TradeManageNew/DataNew.cs @@ -7138,7 +7138,7 @@ end #region 返回扫描订单Model xsx - public static DT_OrderScanModel GetScanOrderModelForReturnFinal_250123(string OrderCode, string OrderCode2, string OrderCode3, string OrderCode4, string OrderCode5, int UserId) + public static DT_OrderScanModel GetScanOrderModelForReturnFinal_250123(string OrderCode, string OrderCode1, string OrderCode2, string OrderCode3, string OrderCode4, string OrderCode5, int UserId) { DT_OrderScanModel model = null; string tsql = @" @@ -7148,7 +7148,7 @@ declare @TrackCode nvarchar(50),@OrderId int,@JoinOrderCode nvarchar(50),@Track 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 inner join DT_OrderInfo b on a.OrderId=b.OrderId - where (isnull(a.ScanState,0)=0 or isnull(a.ScanState,0)=2) and (tracking_id=@OrderCode or tracking_id=@OrderCode2 or tracking_id=@OrderCode3 or tracking_id=@OrderCode4 or tracking_id=@OrderCode5) order by Id desc + where (isnull(a.ScanState,0)=0 or isnull(a.ScanState,0)=2) 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 declare @WorkDesc nvarchar(50),@storeId int select @WorkDesc=WorkDesc from JC_UserInfo where UserId=@UserId @@ -7185,10 +7185,11 @@ end DbCommand cmd = db.GetSqlStringCommand(tsql); db.AddInParameter(cmd, "@UserId", DbType.Int32, UserId); db.AddInParameter(cmd, "@OrderCode", DbType.String, OrderCode); + db.AddInParameter(cmd, "@OrderCode1", DbType.String, OrderCode1); db.AddInParameter(cmd, "@OrderCode2", DbType.String, OrderCode2); - db.AddInParameter(cmd, "@OrderCode3", DbType.String, OrderCode); - db.AddInParameter(cmd, "@OrderCode4", DbType.String, OrderCode2); - db.AddInParameter(cmd, "@OrderCode5", DbType.String, OrderCode); + db.AddInParameter(cmd, "@OrderCode3", DbType.String, OrderCode3); + db.AddInParameter(cmd, "@OrderCode4", DbType.String, OrderCode4); + db.AddInParameter(cmd, "@OrderCode5", DbType.String, OrderCode5); DataSet tb = db.ExecuteDataSet(cmd); if (tb != null) diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs index a06ce3f..6314925 100644 --- a/TradeManageNew/OuterService/ShageService.ashx.cs +++ b/TradeManageNew/OuterService/ShageService.ashx.cs @@ -1853,7 +1853,7 @@ namespace TradeManageNew.OuterService } int UserId = model.UserId; - var ordermodel = DataNew.GetScanOrderModelForReturnFinal_250123(originalSearchValue, Code2, Code3, Code4, Code5, UserId); + var ordermodel = DataNew.GetScanOrderModelForReturnFinal_250123(model.Code,originalSearchValue, Code2, Code3, Code4, Code5, UserId); if (ordermodel != null && ordermodel.GoodsList != null) {