1

BBWYB.Server.API/Controllers/OrderController.cs

@@ -144,5 +144,15 @@ namespace BBWYB.Server.API.Controllers
         {
             return orderBusiness.StatisticsOrderCountByOrderState(shopId);
         }
+
+        /// <summary>
+        /// 齐库推送sku配置状态
+        /// </summary>
+        /// <param name="request"></param>
+        [HttpPost]
+        public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request)
+        {
+             orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+        }
     }
 }

BBWYB.Server.Business/Order/OrderBusiness.cs

@@ -21,10 +21,12 @@ namespace BBWYB.Server.Business
     {
         private OP_PlatformClientFactory opPlatformClientFactory;
         private RestApiService restApiService;
+        private IList<Enums.PackConfigState?> waitConfigStateList;
         public OrderBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, OP_PlatformClientFactory opPlatformClientFactory, RestApiService restApiService) : base(fsql, nLogManager, idGenerator)
         {
             this.opPlatformClientFactory = opPlatformClientFactory;
             this.restApiService = restApiService;
+            waitConfigStateList = new List<Enums.PackConfigState?>() { Enums.PackConfigState.待配置, Enums.PackConfigState.需修改 };
         }
 
         private ISelect<Order, OrderConsignee, OrderCost> GetOrderListQueryConditions(QueryOrderRequest request)
@@ -47,7 +49,7 @@ namespace BBWYB.Server.Business
                                           .WhereIf(!string.IsNullOrEmpty(request.Sku), osku => osku.SkuId == request.Sku)
                                           .WhereIf(!string.IsNullOrEmpty(request.SourceSku), osku => osku.BelongSkuId == request.SourceSku)
                                           .WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId)
-                                          .WhereIf(request.IsWaitConfig, osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
+                                          .WhereIf(request.IsWaitConfig, osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null);
                     select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消)
                                    .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
                                    .WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IsPurchased == true)
@@ -640,7 +642,7 @@ namespace BBWYB.Server.Business
                                                           OrderCount = g.Count()
                                                       });
 
-            var childSelect = fsql.Select<OrderSku>().As("osku").Where(osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
+            var childSelect = fsql.Select<OrderSku>().As("osku").Where(osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null);
             var waitConfigCount = fsql.Select<Order>().Where(o => o.ShopId == shopId)
                                                       .Where(o => !noOrderStateList.Contains(o.OrderState.Value))
                                                       .Where(o => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
@@ -662,5 +664,14 @@ namespace BBWYB.Server.Business
                 WaitConfigCount = waitConfigCount,
             };
         }
+
+        /// <summary>
+        /// 齐库推送sku配置状态
+        /// </summary>
+        /// <param name="request"></param>
+        public void QikuPublishOrderSkuPackConfigState(QikuPublishOrderSkuPackConfigStateRequest request)
+        { 
+        
+        }
     }
 }

BBWYB.Server.Model/Db/Order/OrderSku.cs

@@ -70,10 +70,6 @@ namespace BBWYB.Server.Model.Db
 
         public string Title { get; set; }
 
-
-        /// <summary>
-        /// 打包配置状态(0=待配置, 1=已配置)
-        /// </summary>
         [Column(DbType = "int(1)", MapType = typeof(int?))]
         public Enums.PackConfigState? PackConfigState { get; set; }
 

BBWYB.Server.Model/Dto/Request/QiKu/QikuPublishOrderSkuPackConfigStateRequest.cs

@@ -0,0 +1,11 @@
+namespace BBWYB.Server.Model.Dto
+{
+    public class QikuPublishOrderSkuPackConfigStateRequest
+    {
+        public string OrderId { get; set; }
+
+        public string SkuId { get; set; }
+
+        public Enums.PackConfigState PackConfigState { get; set; }
+    }
+}

BBWYB.Server.Model/Enums.cs

@@ -103,10 +103,10 @@
         public enum PurchaseOrderState
         {
             待发货 = 0,
-            部分发货 = 1, 
-            待收货 = 10, 
-            部分收货 = 11, 
-            已签收 = 20, 
+            部分发货 = 1,
+            待收货 = 10,
+            部分收货 = 11,
+            已签收 = 20,
             已取消 = 100
         }
 
@@ -290,12 +290,13 @@
         }
 
         /// <summary>
-        /// 打包配置状态  待配置 = 0,已配置 = 1
+        /// 打包配置状态  待配置 = 0,已配置 = 1,需修改 = 2
         /// </summary>
         public enum PackConfigState
         {
             待配置 = 0,
-            已配置 = 1
+            已配置 = 1,
+            需修改 = 2
         }
 
         /// <summary>