20260306 合版工单改成和专版工单一样界面

username@email.com

2026-03-12 fe4f494d66a2049583d3ff427e431d5b88fa4eeb

 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)
        {
            try
            {
@@ -331,6 +331,7 @@
                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_OrderExtend orderExtend = orderBasic.OrderExtend;
                Pay_TradingSingle tradingSingle = orderBasic.TradingSingle;
@@ -451,6 +452,20 @@
                                    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;
                                }
                            }
                        }
                    }
                    else
@@ -469,9 +484,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 +519,16 @@
        /// <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)
        {
            try
            {
                bool result = false;
                EC_MergerOrdersDAL dal_EC_MergerOrdersDAL = new EC_MergerOrdersDAL(_dataBase);
                EC_MergerForumsDAL dal_EC_MergerForumsDAL = new EC_MergerForumsDAL(_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>;
                using (TransactionScope t_TransactionScope = new TransactionScope())
                {
                    result = UpdateModel(m_EC_MergerSingle);
@@ -533,10 +554,48 @@
                            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_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;
                        }

                        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 +688,28 @@
                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;
            }
        }
    }
}