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.BLL/EC/EC_OrderBasicBLL.cs | 147 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 143 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 6686e61..1565a5c 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -42,10 +42,14 @@
{
IEC_OrderBasicDAL _eC_OrderBasicDAL = null;
IEC_OrderPrintParameterDAL _eC_OrderPrintParameterDAL = null;
+ IEC_OrderExtendDAL _eC_OrderExtendDAL = null;
+ IPay_TradingSingleDAL _pay_TradingSingleDAL = null;
public EC_OrderBasicBLL()
{
_eC_OrderBasicDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderBasicDAL) as IEC_OrderBasicDAL;
_eC_OrderPrintParameterDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderPrintParameterDAL) as IEC_OrderPrintParameterDAL;
+ _eC_OrderExtendDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IEC_OrderExtendDAL) as IEC_OrderExtendDAL;
+ _pay_TradingSingleDAL = AbstractFactory.Factory.GetDALByInterfaceName(AbstractFactory.DALInterface.IPay_TradingSingleDAL) as IPay_TradingSingleDAL;
}
/// <summary>
@@ -169,6 +173,16 @@
}
/// <summary>
+ /// 淇敼璁㈠崟鐘舵��(闈炴敮浠樼姸鎬佷笖涓嶅彲淇敼涓烘湭鍙楃悊鍜屽凡鍙楃悊)
+ /// </summary>
+ /// <param name="orderOperate">璁㈠崟鎿嶄綔</param>
+ /// <returns></returns>
+ public bool UpSurplusPrintNum(int? Keyid, int? SurplusPrintNum, string Operator)
+ {
+ return _eC_OrderExtendDAL.UpSurplusPrintNumsql(Keyid, SurplusPrintNum, Operator);
+ }
+
+ /// <summary>
/// 鏍规嵁缂栧彿鎵归噺鍒犻櫎鏁版嵁
/// </summary>
/// <param name="currentOperator">褰撳墠鎿嶄綔浜�</param>
@@ -281,6 +295,18 @@
public bool ReceiveMoneyToAccount(int orderId, OA_FirmAccountRecord firmAccountRecord)
{
return _eC_OrderBasicDAL.ReceiveMoneyToAccount(orderId, firmAccountRecord);
+ }
+
+
+ /// <summary>
+ /// 鏀舵(绾夸笅杞处銆佺幇閲�)
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="firmAccountRecord">鎿嶄綔璁板綍</param>
+ /// <returns></returns>
+ public bool ReceiveMoneyToQueren(int orderId, OA_FirmAccountRecord firmAccountRecord)
+ {
+ return _eC_OrderBasicDAL.ReceiveMoneyToQueren(orderId, firmAccountRecord);
}
/// <summary>
@@ -437,9 +463,9 @@
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
/// <returns></returns>
- public 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)
+ public 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)
{
- return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType);
+ return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType, PayState);
}
/// <summary>
@@ -520,6 +546,18 @@
return _eC_OrderBasicDAL.DeleteOutOrder(OrderId);
}
+
+ /// <summary>
+ /// 鍒犻櫎澶栧崗璁㈠崟
+ /// </summary>
+ /// <param name="OrderId"></param>
+ /// <returns></returns>
+ public bool UpdateOldOrderSurplusPrintNum(int outOrderId)
+ {
+ return _eC_OrderBasicDAL.UpdateOldOrderSurplusPrintNum(outOrderId);
+ }
+
+
/// <summary>
/// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��
/// </summary>
@@ -549,7 +587,7 @@
/// <returns></returns>
public IEnumerable<EC_OrderBasic> GetModelPageListForPrepayments(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
{
- string Condition = " and ( ob.[OrderState] ='2' or ob.[OrderState] ='3' and SellerId='"+ SellerId + "' )";
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' ) and SellerId='" + SellerId + "' ";
if (!string.IsNullOrEmpty(DeliveryTime))
{
@@ -621,6 +659,100 @@
Condition += " and ob.DocumentName like '%" + DocumentName + "%'"; ;
}
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," [DeliveryTime] DESC ")
+ };
+ query.Criteria = criterias;
+ return _eC_OrderBasicDAL.SelectModelPage_weiwangong(query, pa);
+ }
+
+
+
+
+ /// <summary>
+ /// 鏌ヨ瀹㈡埛棰勪粯娆惧垪琛�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetModelPageListForSonghuoyanchis(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
+ {
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' or ob.[OrderState] ='4' ) and SellerId='" + SellerId + "' ";
+
+ if (!string.IsNullOrEmpty(DeliveryTime))
+ {
+ if (DeliveryTime == "鏄庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=1 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=1 )";
+ }
+ else if (DeliveryTime == "鍚庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=2 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=2 )";
+ }
+ else if (DeliveryTime == "3澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=3 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=3 )";
+ }
+ else if (DeliveryTime == "4澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=4 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=4 )";
+ }
+ else if (DeliveryTime == "5澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=5 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=5) ";
+ }
+ else if (DeliveryTime == "6澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=6 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=6) ";
+ }
+ else if (DeliveryTime == "7澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=7 )";
+ }
+ else if (DeliveryTime == "涓�鍛ㄥ悗")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
+ }
+ else if (DeliveryTime == "閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+ }
+
+ }
+
+ if (!string.IsNullOrEmpty(Province))
+ Condition += string.Format(" and CustomerCommunications.Province='{0}'", Province);
+
+ if (!string.IsNullOrEmpty(City))
+ Condition += string.Format(" and CustomerCommunications.City='{0}'", City);
+
+ if (!string.IsNullOrEmpty(County))
+ Condition += string.Format(" and CustomerCommunications.County='{0}'", County);
+
+ if (!string.IsNullOrEmpty(BuyerName))
+ {
+ Condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+ }
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ {
+ Condition += string.Format(" and oe.BusinessManagerId='{0}'", BusinessManagerId);
+ }
+
+
+
+ if (!string.IsNullOrEmpty(SellerOrderId))
+ {
+ Condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'"; ;
+ }
+ if (!string.IsNullOrEmpty(DocumentName))
+ {
+ Condition += " and ob.DocumentName like '%" + DocumentName + "%'"; ;
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
@@ -720,12 +852,19 @@
}
- var isWin = _eC_OrderBasicDAL.Updatejinedanjia(eC_OrderBasic.Keyid.Value, eC_OrderBasic.SumPrice.Value, eC_OrderBasic.UnitPrice.Value);
+ var isWin = _eC_OrderBasicDAL.Updatejinedanjia(eC_OrderBasic.Keyid.Value, eC_OrderBasic.SumPrice.Value, eC_OrderBasic.UnitPrice.Value, num);
eC_OrderPrintParameter.PrintParameter = SerializationHelper.Serialize(model);
isWin = _eC_OrderPrintParameterDAL.UpdateModel(eC_OrderPrintParameter);
+ var pay_TradingSingles = _pay_TradingSingleDAL.GetOrderByIds(eC_OrderBasic.Keyid.Value).FirstOrDefault() ;
+ if (pay_TradingSingles != null)
+ {
+ pay_TradingSingles.TradingMoney = eC_OrderBasic.SumPrice.Value;
+ pay_TradingSingles.PayableMoney = eC_OrderBasic.SumPrice.Value;
+ isWin = _pay_TradingSingleDAL.UpdateModel(pay_TradingSingles);
+ }
return isWin;
}
--
Gitblit v1.9.1