From a737eb14fe1b705b07f017e0edc002fae6f857c3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 03 四月 2026 12:59:20 +0800
Subject: [PATCH] 发版套数再增加自定义填写数字 补单的生产施工单不要默认开料规格的数据 "付款未开票”列表中的金额合计放在“金额”格子下面，既要单页合计，又要每页的全部合计 生产要求跟“数量： ”的宽度一样 印刷数量的填写格子跟后道工序一样长
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs | 153 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 149 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_MergerSingleDAL.cs
index 0f59591..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)
+ 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
{
@@ -331,6 +331,8 @@
Pay_TradingSingleDAL _pay_TradingSingleDAL = new Pay_TradingSingleDAL(_dataBase);
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;
@@ -451,6 +453,35 @@
return false;
}
}
+
+ foreach (var m_EC_SpecialForums in m_EC_MergerForumsList)
+ {
+ if (result)
+ {
+ m_EC_SpecialForums.MergerOrderId = m_EC_MergerSingle.Keyid;
+ result = dal_EC_MergerForumsDAL.InserModel(m_EC_SpecialForums);
+
+ }
+ 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;
+ }
+ }
}
}
else
@@ -469,9 +500,14 @@
else
return false;
}
- OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL();
+ OA_InventoryDAL dal_OA_InventoryDAL = new OA_InventoryDAL(_dataBase);
+ OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL(_dataBase);
if (result)
{
+ foreach (var m_OA_Inventory in m_OA_InventoryList)
+ {
+ dal_OA_InventoryDAL.UpdateModel(m_OA_Inventory);
+ }
foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
{
m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Merger('" + m_EC_MergerSingle.Keyid + "')\">鍚堢増锛�" + m_EC_MergerSingle.PMS_OrderNum + "</span>");
@@ -499,15 +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)
+ 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);
@@ -533,10 +572,69 @@
else
return false;
}
+
+ foreach (var m_EC_MergerForums in m_EC_MergerForumsList_Old)
+ {
+ if (result)
+ {
+ result = dal_EC_MergerForumsDAL.DeleteModel(m_EC_MergerForums);
+ }
+ else
+ 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;
+ }
+
if (result)
{
t_TransactionScope.Complete();
}
+ }
+ }
+
+ OA_InventoryDAL dal_OA_InventoryDAL = new OA_InventoryDAL();
+ OA_OutOfStorageDAL dal_OA_OutOfStorageDAL = new OA_OutOfStorageDAL();
+ if (result)
+ {
+ foreach (var m_OA_Inventory in m_OA_InventoryList)
+ {
+ dal_OA_InventoryDAL.UpdateModel(m_OA_Inventory);
+ }
+ foreach (var m_OA_OutOfStorage in m_OA_OutOfStorageList)
+ {
+ //m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Special('" + m_EC_SpecialOrders.Keyid + "')\">涓撶増锛�" + m_EC_SpecialOrders.PSO_OrderNum + "</span>");
+ m_OA_OutOfStorage.Remark = string.Format("<span class='a_under' title='鐐瑰嚮鏌ョ湅鏂藉伐鍗曡鎯�' onclick=\"ViewModel_Merger('" + m_EC_MergerSingle.Keyid + "')\">鍚堢増锛�" + m_EC_MergerSingle.PMS_OrderNum + "</span>");
+ dal_OA_OutOfStorageDAL.InserModel(m_OA_OutOfStorage);
}
}
return result;
@@ -629,5 +727,52 @@
throw ex;
}
}
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱鐗堥潰淇℃伅
+ /// </summary>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.EC_MergerForums> GetEC_MergerForumsListByKeyid(int? Keyid)
+ {
+ try
+ {
+ if (Keyid == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<EC_MergerForums> result = _dataBase.SelectModel<EC_MergerForums>("*", "EC_MergerForums", string.Format(" MergerOrderId='{0}'", Keyid)) as IList<EC_MergerForums>;//鎵ц鏌ヨ
+
+ return result;//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ 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