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.WebForm/Pages/common/PayAbout.aspx.cs | 126 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 1 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
index f59d551..95b562f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
@@ -502,6 +502,20 @@
return NewOrder(orderBasic, inquiryCommonModel.PrintCount, null, 0, inquiryCommonModel, orderExtend);
}
+
+ /// <summary>
+ /// 鏂板绾夸笅璁㈠崟
+ /// </summary>
+ /// <param name="orderBasic">璁㈠崟鍩烘湰淇℃伅瀵硅薄</param>
+ /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅瀵硅薄</param>
+ /// <param name="inquiryCommonModel">璁㈠崟鍗板埛鍙傛暟</param>
+ /// <returns></returns>
+ internal static EC_OrderBasic NewOrderSheji(EC_OrderBasic orderBasic, EC_OrderExtend orderExtend, InquiryCommonModel inquiryCommonModel)
+ {
+ return NewOrderSheji(orderBasic, inquiryCommonModel.PrintCount, null, 0, inquiryCommonModel, orderExtend);
+ }
+
+
/// <summary>
/// 濉厖璁㈠崟鏂规硶鑷冲皯BuyerId銆丅uyerName銆丼ellerId銆丼ellerName銆丱perator銆丳rintTypeId銆丼umPrice銆丱rderTypeId銆丏ocumentName灞炴�ф湁鍊�
/// </summary>
@@ -545,7 +559,8 @@
orderBasic.OrderTypeId = orderBasic.OrderTypeId.HasValue ? orderBasic.OrderTypeId : 1;//娌℃湁绫诲瀷鍒欓粯璁や负1:绾夸笅璁㈠崟
orderBasic.Remark = string.IsNullOrEmpty(orderBasic.Remark) ? eC_AcceptWayByOrder.Remark : orderBasic.Remark;//鑾峰彇澶囨敞
eC_AcceptWayByOrder.Operator = orderBasic.Creater;//鍒跺崟浜�/鎿嶄綔浜�
- orderBasic.DeliveryTime = orderBasic.DeliveryTime.HasValue ? orderBasic.DeliveryTime : DateTime.Now.AddDays(15);//榛樿15澶╁悗浜よ揣
+ if(orderBasic.PrintTypeId !=37)
+ orderBasic.DeliveryTime = orderBasic.DeliveryTime.HasValue ? orderBasic.DeliveryTime : DateTime.Now.AddDays(15);//榛樿15澶╁悗浜よ揣
//orderBasic.TheoryCompleteDate = DateTime.Now.AddDays(15);//鐞嗚瀹屾垚鏃ユ湡(纭鏀惰揣鏃ユ湡)
@@ -674,6 +689,115 @@
}
+
+
+
+ /// <summary>
+ /// 鍦ㄧ嚎涓嬪崟 璁捐璁㈠崟
+ /// </summary>
+ /// <param name="orderBasic">璁㈠崟鍩烘湰淇℃伅瀵硅薄</param>
+ /// <param name="printCount">鍗板埛鏁伴噺</param>
+ /// <param name="pay_Request">鏀粯璇锋眰</param>
+ /// <param name="seckillId">绉掓潃涓氬姟缂栧彿</param>
+ /// <param name="inquiryCommonModel">璁㈠崟鍗板埛鍙傛暟</param>
+ /// <param name="orderExtend">璁㈠崟鎵╁睍淇℃伅瀵硅薄</param>
+ /// <param name="filld">濉厖瀹炰綋濮旀墭</param>
+ /// <returns></returns>
+ private static EC_OrderBasic NewOrderSheji(EC_OrderBasic orderBasic, int printCount, Pay_Request pay_Request = null, int seckillId = 0, InquiryCommonModel inquiryCommonModel = null, EC_OrderExtend orderExtend = null, CY.WebForm.cs.WebUtil.FillModel filld = null)
+ {
+
+ EC_AcceptWayByOrder eC_AcceptWayByOrder = new EC_AcceptWayByOrder();
+ FillOrder(orderBasic, eC_AcceptWayByOrder, orderExtend, filld);
+
+ //orderBasic.TheoryCompleteDate = DateTime.Now.AddDays(15);//鐞嗚瀹屾垚鏃ユ湡(纭鏀惰揣鏃ユ湡)
+ if (null == orderExtend)
+ {
+ orderBasic.OrderExtend.ExigencyCaseId = 0;// sys_DictionaryBLL.GetKeyIdByKeyid(0, "OA_绱ф�ョ▼搴�");//璁剧疆绱ф�ョ▼搴︿负涓�鑸�
+ orderBasic.OrderExtend.ProofreadWayId = -1;// sys_DictionaryBLL.GetKeyIdByKeyid(-1, "EC_鏍＄鏂瑰紡");//璁剧疆鏍＄鏂瑰紡涓�"鑷仈绯�"
+
+ //orderBasic.OrderExtend.Contacts = string.IsNullOrEmpty(eC_AcceptWayByOrder.AcceptContacts) ? eC_AcceptWayByOrder.Accepter : eC_AcceptWayByOrder.AcceptContacts;//鏀惰揣浜轰负鏀惰揣淇℃伅鐨勮仈绯讳汉
+ //orderBasic.OrderExtend.ContactPhone = string.IsNullOrEmpty(eC_AcceptWayByOrder.AccepterPhoneNum) ? eC_AcceptWayByOrder.AccepterPhone : eC_AcceptWayByOrder.AccepterPhoneNum;
+ EC_MemberBasicBLL _memberBasicBLL = new EC_MemberBasicBLL();
+ EC_MemberExtend memberExtend = _memberBasicBLL.GetMemberExtendByMemberId(orderBasic.BuyerId);
+ if (memberExtend != null)
+ {
+ orderBasic.OrderExtend.Contacts = memberExtend.BusinessContacts;
+ orderBasic.OrderExtend.ContactPhone = memberExtend.PhoneNum;
+ }
+ orderBasic.OrderExtend.PrintNum = printCount;
+
+ int? billMode = MyConvert.ConvertToInt32(HttpContext.Current.Request["txtBillMode"]);
+ if (!eC_AcceptWayByOrder.AcceptTypeId.HasValue || !billMode.HasValue)
+ {
+ return null;
+ }
+
+ if (null != inquiryCommonModel)
+ {
+ if (inquiryCommonModel.DeliveryMode > 0)
+ {
+ eC_AcceptWayByOrder.AcceptTypeId = inquiryCommonModel.DeliveryMode;
+ switch (inquiryCommonModel.BillMode)
+ {
+ case 108:
+ eC_AcceptWayByOrder.InvoiceDemand = "涓嶅惈绋庝环";
+ break;
+ case 109:
+ eC_AcceptWayByOrder.InvoiceDemand = "鏅�氬彂绁�";
+ break;
+ case 110:
+ eC_AcceptWayByOrder.InvoiceDemand = "澧炲�肩◣绁�";
+ break;
+ default:
+ break;
+ }
+ eC_AcceptWayByOrder.Remark = inquiryCommonModel.Remarks;
+ }
+ orderBasic.OrderExtend.PrintNum = 13 == inquiryCommonModel.PrintTypeId ? inquiryCommonModel.PrintCount * inquiryCommonModel.PrintBoxNumber : orderBasic.OrderExtend.PrintNum;
+ }
+ else
+ ;
+ }
+ else
+ ;
+ orderBasic.OrderExtend.SurplusPrintNum = orderBasic.OrderExtend.SurplusPrintNum.HasValue ? orderBasic.OrderExtend.SurplusPrintNum : orderBasic.OrderExtend.PrintNum;
+
+
+ double? commission = null == pay_Request ? 0 : MyConvert.ConvertToDouble(CY.Config.WebInfo.Instance.FirmOrderAgencyFee);
+ if (!commission.HasValue)
+ return null;
+ else
+ {
+ }
+
+
+ EC_OrderPrintParameter orderPrintParameter = null;
+ orderPrintParameter = null == inquiryCommonModel ? null : new EC_OrderPrintParameter()
+ {
+ PrintParameter = SerializationHelper.Serialize(inquiryCommonModel)
+ };
+
+ OA_CorporateClientsBLL oA_CorporateClientsBLL = new BLL.OA_CorporateClientsBLL();
+ //涓嬭鍗曞墠鍏堟坊鍔犲鎴�
+ //璁捐璁㈠崟鐢ㄥ弽杞殑MemberId
+ var originalGuid = orderBasic.SellerId;
+ Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
+ if (0 >= oA_CorporateClientsBLL.ConvertToCorporateClient(reversedGuid, orderBasic.BuyerId, orderBasic.Operator))
+ {
+ return null;//娣诲姞瀹㈡埛璋冪敤澶辫触鍒欐坊鍔犺鍗曞け璐�
+ }
+ else
+ ;
+
+ if (orderBasic.SellerId.Equals(orderBasic.BuyerId))
+ return null;//涔板涓嶈兘鏄崠瀹�
+
+ EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();//瀹炰緥鍖栬鍗曚笟鍔℃搷浣滃璞�
+ bool isWin = eC_OrderBLL.NewOrder(orderBasic, orderBasic.OrderExtend, orderBasic.TradingSingle, eC_AcceptWayByOrder, pay_Request, commission.Value, seckillId, orderPrintParameter);
+ return isWin ? orderBasic : null;
+
+ }
+
///// <summary>
///// 鍦ㄧ嚎涓嬪崟
///// </summary>
--
Gitblit v1.9.1