1

BBWY.Client/BBWYAppSettings.json

@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
+  // "QKApiHost": "http://localhost:8080"
-  //"QKApiHost": "http://qiku.qiyue666.com"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }

BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs

@@ -38,7 +38,7 @@ namespace BBWY.Client.Models.APIModel.Request
         /// </summary>
         public int Availability { get; set; }
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭)
         /// </summary>
         public int PositionType { get; set; }
 

BBWY.Client/Models/APIModel/Request/UpdatePurchaseTaskRequest.cs

@@ -19,7 +19,7 @@ namespace BBWY.Client.Models.APIModel.Request
         /// </summary>
         public int Availability { get; set; }
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭)
         /// </summary>
         public int PositionType { get; set; }
 

BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs

@@ -88,7 +88,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         public int PackType { get; set; }
 
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭)
         /// </summary>
         public int PositionType { get; set; }
 

BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs

@@ -90,7 +90,7 @@ namespace BBWY.Client.Models.APIModel
         public int PackType { get; set; }
 
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2,聚水潭=3)
+        /// 落仓(本地仓=0，云仓=1，京仓=2,聚水潭=3)
         /// </summary>
         public string PositionType { get; set; }
 

BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@@ -33,7 +33,7 @@ namespace BBWY.Client.Models
         public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
 
         private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
-        "商家仓","齐越仓", "京东仓","聚水潭仓"};
+        "商家仓","云仓", "京仓","聚水潭齐越仓"};
         public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
        
         private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
@@ -140,7 +140,7 @@ namespace BBWY.Client.Models
 
         private PositionType positionType;
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(本地仓=0，云仓=1，京仓=2)
         /// </summary>
         public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }
 

BBWY.Client/Models/Enums.cs

@@ -262,9 +262,9 @@
     public enum PositionType
     {
         商家仓 = 0,
-        齐越仓 = 1,
+        云仓 = 1,
-        京东仓 = 2,
+        京仓 = 2,
-        聚水潭仓 = 3
+        聚水潭齐越仓 = 3
     }
     /// <summary>
     /// 合格证包装位置
@@ -422,7 +422,7 @@
     }
 
     /// <summary>
-    /// 京东仓库类型 商家仓 = 1, 京仓 = 2, 云仓 = 3
+    /// 京仓库类型 商家仓 = 1, 京仓 = 2, 云仓 = 3
     /// </summary>
     public enum StockType
     {
@@ -442,7 +442,7 @@
     }
     public enum WareType
     {
-        京仓 = 0, 云仓 = 1, 商家仓 = 2, 聚水潭 = 3
+        京仓 = 0, 云仓 = 1, 商家仓 = 2, 聚水潭齐越仓 = 3
     }
 
 }

BBWY.Client/Models/PackTask/PackTaskModel.cs

@@ -394,7 +394,7 @@ namespace BBWY.Client.Models
 
         private string positionType;
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(本地仓=0，云仓=1，京仓=2)
         /// </summary>
         public string PositionType { get => positionType; set { Set(ref positionType, value); } }
 

BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@@ -35,7 +35,7 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
 
         private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
-        "商家仓","齐越仓", "京东仓","聚水潭仓"};
+        "商家仓","云仓", "京仓","聚水潭齐越仓"};
         public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
 
         private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
@@ -236,7 +236,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         private PositionType positionType;
         /// <summary>
-        /// 落仓(本地仓=0，齐越仓=1，京东仓=2)
+        /// 落仓(本地仓=0，云仓=1，京仓=2)
         /// </summary>
         public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }
 

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -37,7 +37,7 @@ namespace BBWY.Client.ViewModels.PackTask
         public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
 
         private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
-        "商家仓","齐越仓", "京东仓","聚水潭仓"};
+        "商家仓","云仓", "京仓","聚水潭齐越仓"};
         public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
 
         private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
@@ -144,7 +144,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         private PositionType positionType;
         /// <summary>
-        /// 落仓(商家仓=0，齐越仓=1，京东仓=2,聚水潭仓=3)
+        /// 落仓(商家仓=0，云仓=1，京仓=2,聚水潭齐越仓=3)
         /// </summary>
         public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }
 

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -62,7 +62,7 @@ namespace BBWY.Client.ViewModels
         public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
 
         private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
-        "商家仓","齐越仓", "京东仓","聚水潭仓"};
+        "商家仓","云仓", "京仓","聚水潭齐越仓"};
         public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
 
         private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
@@ -203,7 +203,7 @@ namespace BBWY.Client.ViewModels
 
         private PositionType positionType;
         /// <summary>
-        /// 落仓(商家仓=0，齐越仓=1，京东仓=2,聚水潭仓=3)
+        /// 落仓(商家仓=0，云仓=1，京仓=2,聚水潭齐越仓=3)
         /// </summary>
         public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }