diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index 7963336c..b4290f2b 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -131,9 +131,9 @@ namespace WMS.Web.Api.Controllers if (loginInfo == null || loginInfo.UserInfo == null) return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); - List str = new List(); - str.Add(billNo); - var res2 = await _repositories.GetListBySourceBillNo(str); + //List str = new List(); + //str.Add(billNo); + //var res2 = await _repositories.GetListBySourceBillNo(str); var res = await _repositories.GetOutStockTaskListByNo(billNo); if (res == null || res.Count() == 0) return ResultList.ReFailure(ResultCodes.OutStockTaskNoData); diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json index 435b0894..f6ff18e5 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -52,7 +52,7 @@ "AccessKey": "dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms", "SecretKey": "KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q", "Bucket": "orico-wms-test", //正式 orico-wms - "Url": "http://wmstestfile.f2b211.com/" //测试 http://wmstestfile.f2b211.com/ 正式 http://wmsfile.f2b211.com/ + "Url": "https://wmstestfile.f2b211.com/" //测试 https://wmstestfile.f2b211.com/ 正式 https://wmsfile.f2b211.com/ }, "HttpOptions": { "Url": "dev.uc.f2b211.com", diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index b1cb99f1..7d371a3f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -5088,11 +5088,6 @@ 鍑哄簱鐘舵 - - - 宸插嚭搴 - - 寰呭嚭搴 @@ -5103,6 +5098,11 @@ 閮ㄥ垎鍑哄簱 + + + 宸插嚭搴 + + 宸蹭綔搴 diff --git a/src/WMS.Web.Domain/Values/OutStockStatus.cs b/src/WMS.Web.Domain/Values/OutStockStatus.cs index fe68e46b..beccdf2a 100644 --- a/src/WMS.Web.Domain/Values/OutStockStatus.cs +++ b/src/WMS.Web.Domain/Values/OutStockStatus.cs @@ -10,11 +10,6 @@ namespace WMS.Web.Domain.Values /// public enum OutStockStatus { - /// - /// 宸插嚭搴 - /// - [EnumRemark("宸插嚭搴")] - Already = 1, /// /// 寰呭嚭搴 /// @@ -26,6 +21,11 @@ namespace WMS.Web.Domain.Values [EnumRemark("閮ㄥ垎鍑哄簱")] Part = 3, /// + /// 宸插嚭搴 + /// + [EnumRemark("宸插嚭搴")] + Already = 1, + /// /// 宸蹭綔搴 /// [EnumRemark("宸蹭綔搴")] diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs index e4e4de4f..70a4a6fe 100644 --- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs @@ -341,7 +341,7 @@ namespace WMS.Web.Repositories { var entity = list.FirstOrDefault(f => f.Id == r.Id); r.StockCode = entity.StockCode; - r.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, r.StockCode); + r.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode+ entity.OrgCode); } //鑾峰彇鐗╂枡淇℃伅 鏄剧ず鐗╂枡涓変欢濂 foreach (var r in response.SelectMany(s => s.details)) @@ -373,7 +373,7 @@ namespace WMS.Web.Repositories var response = _mapper.Map(entity); response.StockCode = entity.StockCode; - response.StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, response.StockCode); + response.StockName = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, entity.StockCode + entity.OrgCode); //鑾峰彇鐗╂枡淇℃伅 鏄剧ず鐗╂枡涓変欢濂 foreach (var r in response.details) {