From b1ac791a0e8896ee3d2016949911d44c9f0fb7a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 16 三月 2026 13:17:23 +0800
Subject: [PATCH] 封面的构件选项修改为“封面、封内合拼、多单合拼、内页”，默认封面 选择了封面构件后，新增的内页构件中的选项该为“内页、多单合拼”， 默认内页 专版按以上 合版的选项中增加“无”，默认无 无”打印的时候为空白，不显示“无”字
---
CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
index 590bc57..79e5932 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_MergerSingleBLL.cs
@@ -103,9 +103,9 @@
/// <param name="acceptWayByOrder"></param>
/// <param name="orderPrintParameter"></param>
/// <returns></returns>
- public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId)
+ public bool AddSpecialForums(List<EC_OrderOperate> m_EC_OrderOperateList, EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, bool IsOut, OA_OrderWorkListRelation m_OA_OrderWorkListRelation_new, EC_OrderBasic orderBasic, EC_AcceptWayByOrder acceptWayByOrder, EC_OrderPrintParameter orderPrintParameter, List<OA_OutOfStorage> m_OA_OutOfStorageList, string[] orderId, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList)
{
- return idal_IEC_MergerSingleDAL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, orderBasic, acceptWayByOrder, orderPrintParameter, m_OA_OutOfStorageList, orderId);
+ return idal_IEC_MergerSingleDAL.AddSpecialForums(m_EC_OrderOperateList, m_EC_MergerSingle, m_EC_MergerOrdersList, IsOut, m_OA_OrderWorkListRelation_new, orderBasic, acceptWayByOrder, orderPrintParameter, m_OA_OutOfStorageList, orderId, m_EC_MergerForumsList, m_OA_InventoryList);
}
/// <summary>
@@ -114,9 +114,9 @@
/// <param name="m_EC_MergerSingle"></param>
/// <param name="m_EC_MergerOrdersList"></param>
/// <returns></returns>
- public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList)
+ public bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
{
- return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList);
+ return idal_IEC_MergerSingleDAL.UpdateSpecialForums(m_EC_MergerSingle, m_EC_MergerOrdersList, m_EC_MergerForumsList, m_OA_InventoryList, m_OA_OutOfStorageList);
}
/// <summary>
@@ -140,5 +140,15 @@
{
return idal_IEC_MergerSingleDAL.GetOA_OrderWorkListRelationByOrderIdAndTypeId(OrderId,TypeId);
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid)
+ {
+ return idal_IEC_MergerSingleDAL.GetEC_MergerForumsListByKeyid(Keyid);
+ }
}
}
--
Gitblit v1.9.1