From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index f82425d..fa9abd8 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -71,6 +71,15 @@
IEnumerable<EC_OrderBasic> SelectModelPageSeal(Infrastructure.Query.Pagination pagination, Dictionary<int, object> searchParam);
+
+ /// <summary>
+ /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates);
+
+
/// <summary>
/// 鍙楃悊璁㈠崟
/// </summary>
@@ -78,6 +87,14 @@
/// <param name="commission">鍙楃悊浣ｉ噾(鍙楃悊璁㈠崟鏃剁珯鏂规敹鍙栫殑鏈嶅姟璐�)</param>
/// <returns></returns>
bool AcceptOrder(int orderId, double commission);
+
+ /// <summary>
+ /// 鍙楃悊璁㈠崟
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="operator">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ bool SuodingOrder(int orderId, string operater);
/// <summary>
/// 鎵归噺鍙楃悊璁㈠崟
@@ -198,6 +215,16 @@
/// <returns></returns>
bool ReceiveMoneyToAccount(int orderId, OA_FirmAccountRecord firmAccountRecord);
+
+ /// <summary>
+ /// 鏀舵(绾夸笅杞处銆佺幇閲�)
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="firmAccountRecord">鎿嶄綔璁板綍</param>
+ /// <returns></returns>
+ bool ReceiveMoneyToQueren(int orderId, OA_FirmAccountRecord firmAccountRecord);
+
+
/// <summary>
/// 鏀舵(澶栧崗棰勪粯娆俱�佸鎴烽浠樻)
/// </summary>
@@ -261,12 +288,20 @@
/// <summary>
+ /// 淇敼閲戦鍜屽崟浠�
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <param name="SumPrice"></param>
+ /// <param name="UnitPrice"></param>
+ bool Updatejinedanjia(int orderId,decimal SumPrice, decimal UnitPrice,int num);
+
+ /// <summary>
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
/// <param name="orderId"></param>
void UpdatePrintfengqianState(int orderId);
- void UpdatePrintBiaoqianState(int orderId);
+ void UpdatePrintBiaoqianState(int orderId);
/// <summary>
/// 鏌ヨ鍚庨亾(3)鏁村崟(4)
@@ -282,8 +317,9 @@
/// <param name="WorkStates"></param>
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
+ /// <param name="PayState"></param>
/// <returns></returns>
- IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType);
+ IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null);
/// <summary>
/// 鍒嗛〉鏌ヨ澶栧崗璁㈠崟(鏍规嵁鑱旂郴浜哄拰缁撴潫鐘舵��)
@@ -341,6 +377,13 @@
bool DeleteOutOrder(int OrderId);
/// <summary>
+ /// 淇敼鍘熻鍗曟暟閲�
+ /// </summary>
+ /// <param name="OrderId"></param>
+ /// <returns></returns>
+ bool UpdateOldOrderSurplusPrintNum(int outOrderId);
+
+ /// <summary>
/// 缁熻璁㈠崟閲戦
/// </summary>
/// <param name="pagination">鍒嗛〉瀵硅薄</param>
--
Gitblit v1.9.1