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 @@
}
///
- /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1)
+ /// 入仓类型 (发回齐越 = 0, 厂商代发入仓 = 1,其他仓不包装 = 2)
///
public enum IntoStoreType
{
- 发回齐越 = 0, 厂商代发入仓 = 1
+ 发回齐越 = 0, 厂商代发入仓 = 1, 其他仓不包装 = 2
}
///