From 201f6be79f1a2c257a6dbb901dd4d50f017e12b6 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 23 Aug 2023 15:23:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BB=93=E4=B8=8D=E5=8C=85?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/OrderStateExtension.cs                  | 10 +++-------
 BBWYB.Server.Model/Enums.cs                            |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
index 9b5c861..eef8e59 100644
--- a/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
+++ b/BBWYB.Server.Business/Extensions/OrderStateExtension.cs
@@ -117,14 +117,10 @@ namespace BBWYB.Server.Business
                 {
                     if (order.OrderState != Enums.OrderState.待核算)
                         order.OrderState = Enums.OrderState.待验收;
-                    //if (jdInStoreOrderDetailList == null || jdInStoreOrderDetailList.Count() == 0 || jdInStoreOrderDetailList.Any(x => x.storageStatus != "2"))
-                    //{
-                    //    order.OrderState = Enums.OrderState.待验收;
-                    //    IsNotifyDingDingWhenInStoreOrderFail = true;
-                    //}
-                    //else
-                    //    order.OrderState = Enums.OrderState.待核算;
+
                 }
+                else if (order.IntoStoreType == Enums.IntoStoreType.其他仓不包装)
+                    order.OrderState = Enums.OrderState.待核算;
                 return;
             }
             #endregion
diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs
index 0c1429f..104bf09 100644
--- a/BBWYB.Server.Model/Enums.cs
+++ b/BBWYB.Server.Model/Enums.cs
@@ -300,11 +300,11 @@
         }
 
         /// <summary>
-        /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1)
+        /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1,其他仓不包装 = 2)
         /// </summary>
         public enum IntoStoreType
         {
-            发回齐越 = 0, 厂商代发入仓 = 1
+            发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装 = 2
         }
 
         /// <summary>