From 125c6f0b6c4efd656f92d5eedac2bdcaa0bafb30 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 23 Aug 2023 13:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=81=9A=E6=B0=B4=E6=BD=AD=E9=BD=90=E8=B6=8A?=
 =?UTF-8?q?=E4=BB=93=EF=BC=8C=E8=81=9A=E6=B0=B4=E6=BD=AD=E6=83=A0=E5=AE=89?=
 =?UTF-8?q?=E4=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BatchPurchase/BatchPurchaseBusiness.cs                | 7 +++++--
 BBWY.Server.Model/Enums.cs                                | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index cf5f1635..531fb3dc 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -725,7 +725,8 @@ namespace BBWY.Server.Business
                             ProductAmount = currentOrderSkuProductAmount,
                             PurchaseFreight = currentOrderSkuFreightAmount,
                             CreateTime = DateTime.Now,
-                            StockType = request.IntoStoreType == Enums.IntoStoreType.发回齐越 ? firstProductParam.StockType : null
+                            StockType = request.IntoStoreType == Enums.IntoStoreType.发回齐越 || request.IntoStoreType == Enums.IntoStoreType.其他仓不包装 ?
+                                        firstProductParam.StockType : null
                         };
                         insertPurchaseOrderSkuList.Add(purchaseOrderSku);
 
@@ -878,8 +879,10 @@ namespace BBWY.Server.Business
                 return 1;
             if (stockType == Enums.StockType.商家仓)
                 return 0;
-            if (stockType == Enums.StockType.聚水潭)
+            if (stockType == Enums.StockType.聚水潭齐越仓)
                 return 3;
+            if (stockType == Enums.StockType.聚水潭惠安仓)
+                return 4;
             return 0;
         }
 
diff --git a/BBWY.Server.Model/Enums.cs b/BBWY.Server.Model/Enums.cs
index 8acc29b2..916c07cb 100644
--- a/BBWY.Server.Model/Enums.cs
+++ b/BBWY.Server.Model/Enums.cs
@@ -208,11 +208,11 @@
         }
 
         /// <summary>
-        /// 仓库类型(如业务不需要则为null) 商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭=4
+        /// 仓库类型(如业务不需要则为null)  商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭齐越仓 = 4, 聚水潭惠安仓 = 5
         /// </summary>
         public enum StockType
         {
-            商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭 = 4
+            商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭齐越仓 = 4, 聚水潭惠安仓 = 5
         }
 
         /// <summary>
@@ -373,11 +373,11 @@
         }
 
         /// <summary>
-        /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1)
+        /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装=2)
         /// </summary>
         public enum IntoStoreType
         {
-            发回齐越 = 0, 厂商代发入仓 = 1
+            发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装 = 2
         }
     }
 }