From e67b811c4601e7a68c2a980cab2982aebf44c60c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 08:46:43 +0800
Subject: [PATCH] 减号要选择性的删除。每行都要有减号 完成 现在的“印刷数量”就是新版格式的“生产数量”，放在“生产要求”前面，跟生产要求一行 完成 消耗格子的宽度适当缩小点 完成
---
CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
index c10bdb2..c990867 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_MergerSingleDAL.cs
@@ -52,7 +52,7 @@
/// <param name="acceptWayByOrder"></param>
/// <param name="orderPrintParameter"></param>
/// <returns></returns>
- 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);
+ 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, List<EC_MergerHoudaos> m_EC_MergerHoudaosList);
/// <summary>
/// 淇敼鍚堢増鏂藉伐鍗�
@@ -60,7 +60,7 @@
/// <param name="m_EC_MergerSingle"></param>
/// <param name="m_EC_MergerOrdersList"></param>
/// <returns></returns>
- bool UpdateSpecialForums(EC_MergerSingle m_EC_MergerSingle, List<EC_MergerOrders> m_EC_MergerOrdersList);
+ 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, List<EC_MergerHoudaos> m_EC_MergerHoudaosList);
/// <summary>
/// 鍒嗛〉鏌ヨ
@@ -77,5 +77,21 @@
/// <param name="TypeId"></param>
/// <returns></returns>
OA_OrderWorkListRelation GetOA_OrderWorkListRelationByOrderIdAndTypeId(int? OrderId, int? TypeId);
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid);
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ IEnumerable<Model.EC_MergerHoudaos> GetEC_MergerHoudaosListByKeyid(int? Keyid);
}
}
--
Gitblit v1.9.1