From b03ae699c49cfca53d22772f0c2aec5210bc9758 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 02 四月 2026 08:50:35 +0800
Subject: [PATCH] 张薇按我这个界面比例画图 生产要求只填1行就够了，其他跟之前的一样 这个地方是增加或者删除不需要的后道
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
index dfd84cc..ac33e69 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
@@ -317,7 +317,7 @@
/// <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, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList)
+ 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, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
{
try
{
@@ -332,6 +332,7 @@
EC_AcceptWayByOrderDAL _eC_AcceptWayByOrderDAL = new EC_AcceptWayByOrderDAL(_dataBase);
EC_OrderOperateDAL _eC_OrderOperateDAL = new EC_OrderOperateDAL(_dataBase);
EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_dataBase);
+ EC_MergerHoudaosDAL dal_EC_MergerHoudaosDAL = new EC_MergerHoudaosDAL(_dataBase);
EC_OrderExtend orderExtend = orderBasic.OrderExtend;
Pay_TradingSingle tradingSingle = orderBasic.TradingSingle;
@@ -466,6 +467,21 @@
return false;
}
}
+
+
+ foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList)
+ {
+ if (result)
+ {
+ m_EC_MergerHoudaos.MergerOrderId = m_EC_MergerSingle.Keyid;
+ result = dal_EC_MergerHoudaosDAL.InserModel(m_EC_MergerHoudaos);
+
+ }
+ else
+ {
+ return false;
+ }
+ }
}
}
else
@@ -519,16 +535,18 @@
/// <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, List<EC_MergerForums> m_EC_MergerForumsList, List<OA_Inventory> m_OA_InventoryList, List<OA_OutOfStorage> m_OA_OutOfStorageList)
+ 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, List<EC_MergerHoudaos> m_EC_MergerHoudaosList)
{
try
{
bool result = false;
EC_MergerOrdersDAL dal_EC_MergerOrdersDAL = new EC_MergerOrdersDAL(_dataBase);
EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_dataBase);
+ EC_MergerHoudaosDAL dal_EC_MergerHoudaosDAL = new EC_MergerHoudaosDAL(_dataBase);
List<EC_MergerOrders> m_EC_MergerOrdersList_Old = GetEC_MergerOrdersListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerOrders>;
List<EC_MergerForums> m_EC_MergerForumsList_Old = GetEC_MergerForumsListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerForums>;
+ List<EC_MergerHoudaos> m_EC_MergerHoudaosList_Old = GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
using (TransactionScope t_TransactionScope = new TransactionScope())
{
result = UpdateModel(m_EC_MergerSingle);
@@ -565,12 +583,33 @@
return false;
}
+ foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList_Old)
+ {
+ if (result)
+ {
+ result = dal_EC_MergerHoudaosDAL.DeleteModel(m_EC_MergerHoudaos);
+ }
+ else
+ return false;
+ }
+
foreach (var m_EC_MergerForums in m_EC_MergerForumsList)
{
if (result)
{
m_EC_MergerForums.MergerOrderId = m_EC_MergerSingle.Keyid;
result = dal_EC_MergerForumsDAL.InserModel(m_EC_MergerForums);
+ }
+ else
+ return false;
+ }
+
+ foreach (var m_EC_MergerHoudaos in m_EC_MergerHoudaosList)
+ {
+ if (result)
+ {
+ m_EC_MergerHoudaos.MergerOrderId = m_EC_MergerSingle.Keyid;
+ result = dal_EC_MergerHoudaosDAL.InserModel(m_EC_MergerHoudaos);
}
else
return false;
@@ -711,5 +750,29 @@
throw ex;
}
}
+
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.EC_MergerHoudaos> GetEC_MergerHoudaosListByKeyid(int? Keyid)
+ {
+ try
+ {
+ if (Keyid == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<EC_MergerHoudaos> result = _dataBase.SelectModel<EC_MergerHoudaos>("*", "EC_MergerHoudaos", string.Format(" MergerOrderId='{0}'", Keyid)) as IList<EC_MergerHoudaos>;//鎵ц鏌ヨ
+
+ return result;//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
}
}
--
Gitblit v1.9.1