chuanyin-group-project.git

			@@ -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);

			/// <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);

			/// <summary>
			/// 分页查询
			@@ -77,5 +77,13 @@
			/// <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);
			}
			}