From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index 2e762a3..9a3e3d9 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, string BuyerName);
+
+
/// <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>
/// 鎵归噺鍙楃悊璁㈠崟
@@ -110,6 +127,16 @@
/// <returns></returns>
bool DeleteDataByIds(string currentOperator, params int[] ids);
+
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ bool DeleteModelsheji(Infrastructure.Domain.IAggregateRoot model);
+
+
/// <summary>
/// 鏍规嵁鍗栧缂栧彿鍔犺浇涓嬩竴璁㈠崟缂栧彿鏂规硶
/// </summary>
@@ -123,6 +150,21 @@
/// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
/// <returns></returns>
EC_OrderBasic SelectModelById(int orderId);
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+ /// <returns></returns>
+ EC_OrderBasic SelectModelByxiadanId(int orderId);
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds);
/// <summary>
/// 鍙戣捣璁㈠崟灞炴�ф敼鍙樿姹�
@@ -191,6 +233,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>
@@ -252,7 +304,22 @@
/// <param name="orderId"></param>
void UpdatePrintState(int orderId);
- void UpdatePrintBiaoqianState(int orderId);
+
+ /// <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);
/// <summary>
/// 鏌ヨ鍚庨亾(3)鏁村崟(4)
@@ -268,8 +335,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>
/// 鍒嗛〉鏌ヨ澶栧崗璁㈠崟(鏍规嵁鑱旂郴浜哄拰缁撴潫鐘舵��)
@@ -327,6 +395,13 @@
bool DeleteOutOrder(int OrderId);
/// <summary>
+ /// 淇敼鍘熻鍗曟暟閲�
+ /// </summary>
+ /// <param name="OrderId"></param>
+ /// <returns></returns>
+ bool UpdateOldOrderSurplusPrintNum(int outOrderId);
+
+ /// <summary>
/// 缁熻璁㈠崟閲戦
/// </summary>
/// <param name="pagination">鍒嗛〉瀵硅薄</param>
@@ -373,5 +448,16 @@
/// <param name="FirmId"></param>
/// <returns></returns>
IEnumerable<Model.EC_OrderBasic> GetEC_OrderBasicListBydeliverorderId(Guid deliverorderId, Guid FirmId);
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <param name="MemberId"></param>
+ /// <returns></returns>
+ IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId,string PrintTypeId,string BusinessManagerId,string Shejirenyuan,string BuyerName,string DocumentName,string ShejiStatus, string shifoujiesuan);
+
}
}
--
Gitblit v1.9.1