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 @@
}
///
- /// 仓库类型(如业务不需要则为null) 商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭=4
+ /// 仓库类型(如业务不需要则为null) 商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭齐越仓 = 4, 聚水潭惠安仓 = 5
///
public enum StockType
{
- 商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭 = 4
+ 商家仓 = 1, 京仓 = 2, 云仓 = 3, 聚水潭齐越仓 = 4, 聚水潭惠安仓 = 5
}
///
@@ -373,11 +373,11 @@
}
///
- /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1)
+ /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装=2)
///
public enum IntoStoreType
{
- 发回齐越 = 0, 厂商代发入仓 = 1
+ 发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装 = 2
}
}
}