diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index e1b3dcff..ef760e08 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - "QKApiHost": "http://localhost:8080" - //"QKApiHost": "http://qiku.qiyue666.com" + // "QKApiHost": "http://localhost:8080" + "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs b/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs index 7dc26ce4..990f7540 100644 --- a/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs @@ -38,7 +38,7 @@ namespace BBWY.Client.Models.APIModel.Request /// public int Availability { get; set; } /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(商家仓=0,云仓=1,京仓=2,3=聚水潭) /// public int PositionType { get; set; } diff --git a/BBWY.Client/Models/APIModel/Request/UpdatePurchaseTaskRequest.cs b/BBWY.Client/Models/APIModel/Request/UpdatePurchaseTaskRequest.cs index 09c44955..3863ff70 100644 --- a/BBWY.Client/Models/APIModel/Request/UpdatePurchaseTaskRequest.cs +++ b/BBWY.Client/Models/APIModel/Request/UpdatePurchaseTaskRequest.cs @@ -19,7 +19,7 @@ namespace BBWY.Client.Models.APIModel.Request /// public int Availability { get; set; } /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(商家仓=0,云仓=1,京仓=2,3=聚水潭) /// public int PositionType { get; set; } diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs index 620bb367..8f37c71a 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs @@ -88,7 +88,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask public int PackType { get; set; } /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(商家仓=0,云仓=1,京仓=2,3=聚水潭) /// public int PositionType { get; set; } diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs index 27dbc3f8..adaa3bc9 100644 --- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs +++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs @@ -90,7 +90,7 @@ namespace BBWY.Client.Models.APIModel public int PackType { get; set; } /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2,聚水潭=3) + /// 落仓(本地仓=0,云仓=1,京仓=2,聚水潭=3) /// public string PositionType { get; set; } diff --git a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs index f93c035c..64475d89 100644 --- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs +++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs @@ -33,7 +33,7 @@ namespace BBWY.Client.Models public ObservableCollection WorryList { get => worryList; set { Set(ref worryList, value); } } private ObservableCollection positionTypeList = new ObservableCollection { - "商家仓","齐越仓", "京东仓","聚水潭仓"}; + "商家仓","云仓", "京仓","聚水潭齐越仓"}; public ObservableCollection PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } } private ObservableCollection packTypeList = new ObservableCollection { @@ -140,7 +140,7 @@ namespace BBWY.Client.Models private PositionType positionType; /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(本地仓=0,云仓=1,京仓=2) /// public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } } diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs index e729248f..ab60c405 100644 --- a/BBWY.Client/Models/Enums.cs +++ b/BBWY.Client/Models/Enums.cs @@ -262,9 +262,9 @@ public enum PositionType { 商家仓 = 0, - 齐越仓 = 1, - 京东仓 = 2, - 聚水潭仓 = 3 + 云仓 = 1, + 京仓 = 2, + 聚水潭齐越仓 = 3 } /// /// 合格证包装位置 @@ -422,7 +422,7 @@ } /// - /// 京东仓库类型 商家仓 = 1, 京仓 = 2, 云仓 = 3 + /// 京仓库类型 商家仓 = 1, 京仓 = 2, 云仓 = 3 /// public enum StockType { @@ -442,7 +442,7 @@ } public enum WareType { - 京仓 = 0, 云仓 = 1, 商家仓 = 2, 聚水潭 = 3 + 京仓 = 0, 云仓 = 1, 商家仓 = 2, 聚水潭齐越仓 = 3 } } diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs index ad43c341..ff2e2911 100644 --- a/BBWY.Client/Models/PackTask/PackTaskModel.cs +++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs @@ -394,7 +394,7 @@ namespace BBWY.Client.Models private string positionType; /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(本地仓=0,云仓=1,京仓=2) /// public string PositionType { get => positionType; set { Set(ref positionType, value); } } diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs index 0b56c063..fd9434b1 100644 --- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs @@ -35,7 +35,7 @@ namespace BBWY.Client.ViewModels.PackTask public ObservableCollection WorryList { get => worryList; set { Set(ref worryList, value); } } private ObservableCollection positionTypeList = new ObservableCollection { - "商家仓","齐越仓", "京东仓","聚水潭仓"}; + "商家仓","云仓", "京仓","聚水潭齐越仓"}; public ObservableCollection PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } } private ObservableCollection packTypeList = new ObservableCollection { @@ -236,7 +236,7 @@ namespace BBWY.Client.ViewModels.PackTask private PositionType positionType; /// - /// 落仓(本地仓=0,齐越仓=1,京东仓=2) + /// 落仓(本地仓=0,云仓=1,京仓=2) /// public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } } diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs index b21b907d..7fb2af60 100644 --- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs @@ -37,7 +37,7 @@ namespace BBWY.Client.ViewModels.PackTask public ObservableCollection WorryList { get => worryList; set { Set(ref worryList, value); } } private ObservableCollection positionTypeList = new ObservableCollection { - "商家仓","齐越仓", "京东仓","聚水潭仓"}; + "商家仓","云仓", "京仓","聚水潭齐越仓"}; public ObservableCollection PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } } private ObservableCollection packTypeList = new ObservableCollection { @@ -144,7 +144,7 @@ namespace BBWY.Client.ViewModels.PackTask private PositionType positionType; /// - /// 落仓(商家仓=0,齐越仓=1,京东仓=2,聚水潭仓=3) + /// 落仓(商家仓=0,云仓=1,京仓=2,聚水潭齐越仓=3) /// public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } } diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs index 93677f53..2478023f 100644 --- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs +++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs @@ -62,7 +62,7 @@ namespace BBWY.Client.ViewModels public ObservableCollection WorryList { get => worryList; set { Set(ref worryList, value); } } private ObservableCollection positionTypeList = new ObservableCollection { - "商家仓","齐越仓", "京东仓","聚水潭仓"}; + "商家仓","云仓", "京仓","聚水潭齐越仓"}; public ObservableCollection PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } } private ObservableCollection packTypeList = new ObservableCollection { @@ -203,7 +203,7 @@ namespace BBWY.Client.ViewModels private PositionType positionType; /// - /// 落仓(商家仓=0,齐越仓=1,京东仓=2,聚水潭仓=3) + /// 落仓(商家仓=0,云仓=1,京仓=2,聚水潭齐越仓=3) /// public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }