From e110200c2e32a0f82f474fa38b315ae6360f2dc4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 三月 2025 08:39:38 +0800
Subject: [PATCH] 在订单列表 送货安排 点击打印送货单 选择送货日期 默认最晚的送货日期，默认当天，可以修改 完成 司机查询 拥有司机小程序权限的人员 完成 新增送货 可以选择客户，也可以 填写临时客户 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index 3833296..861021a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -24,7 +24,7 @@
using System.Text;
using CY.BLL.Sys;
using System.Transactions;
-
+using CY.Model.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -36,6 +36,8 @@
OA_StaffBLL oA_StaffBLL = null;
OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
OA_DeliverPlanBLL oA_DeliverPlanBLL = null;
+ EC_OrderPrintParameterBLL eC_OrderPrintParameterBLL = null;
+ Sys_DictionaryBLL dictionaryBLL = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
/// </summary>
@@ -47,6 +49,8 @@
oA_StaffBLL = new OA_StaffBLL();
_OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
oA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ dictionaryBLL = new Sys_DictionaryBLL();
}
/// <summary>
@@ -71,20 +75,23 @@
List<EC_AcceptWayByOrder> eC_AcceptWayByOrders = null;
- OA_CorporateClients oA_CorporateClients = null;
+ //OA_CorporateClients oA_CorporateClients = null;
OA_CorporateClients oA_CorporateClientsBiddingcompany = null;
OA_DeliverPlan oA_DeliverPlan = null;
try
{
oA_DeliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(deliverorderId, null, null);
- oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_DeliverPlan.BuyerId);
- oA_CorporateClientsBiddingcompany = _oA_CorporateClientsBLL.SelectBiddingcompanyByFirmId(CurrentUser.MemberId).Where(x => x.Keyid1 == oA_CorporateClients.Biddingcompany).FirstOrDefault();
- if (oA_CorporateClientsBiddingcompany != null)
- {
- this.spnD.InnerText = oA_CorporateClientsBiddingcompany.CompanyName;
- }
- OA_Staff oA_Staff = oA_StaffBLL.GetModelByKeyid(oA_CorporateClients.BusinessManagerId);
+ // oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_DeliverPlan.BuyerId);
+
+ oA_CorporateClientsBiddingcompany = _oA_CorporateClientsBLL.SelectBiddingcompanyByFirmId(CurrentUser.MemberId).Where(x => x.Keyid1 == oA_DeliverPlan.Biddingcompany).FirstOrDefault();
+ if (oA_CorporateClientsBiddingcompany != null)
+ {
+ this.spnD.InnerText = oA_CorporateClientsBiddingcompany.CompanyName;
+ }
+
+
+ OA_Staff oA_Staff = oA_StaffBLL.GetModelByKeyid(oA_DeliverPlan.BusinessManagerId);
if (oA_Staff != null)
{
this.spnB.InnerText = oA_Staff.Name;
@@ -94,7 +101,7 @@
{
this.spnC.InnerText = oA_Staffsss.Name;
}
- this.spnBuyerName.InnerText = oA_CorporateClients.CompanyName;
+ this.spnBuyerName.InnerText = oA_DeliverPlan.CompanyName;
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
@@ -114,14 +121,11 @@
List<Model.EC_OrderBasic> eC_OrderBasics = _eC_OrderBasicBLL.GetEC_OrderBasicListBydeliverorderId(deliverorderId,CurrentUser.MemberId).ToList();
-
- rptData.DataSource = eC_OrderBasics;
- rptData.DataBind();
decimal SumPrice = 0;
- if (eC_OrderBasics!=null && eC_OrderBasics.Count > 0)
+ if (eC_OrderBasics != null && eC_OrderBasics.Count > 0)
{
- for(int i=0;i< eC_OrderBasics.Count; i++)
+ for (int i = 0; i < eC_OrderBasics.Count; i++)
{
if (i == 0)
{
@@ -133,8 +137,24 @@
this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
}
- SumPrice += eC_OrderBasics[i].SumPrice.Value;
+ }
+ SumPrice += eC_OrderBasics[i].SumPrice.Value;
+ EC_OrderPrintParameter _eC_OrderPrintParameter = eC_OrderPrintParameterBLL.GetModel(eC_OrderBasics[i].Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+ eC_OrderBasics[i].PrintSizeName = _inquiryCommonModel.PrintSizeName;
+ var sss = dictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == eC_OrderBasics[i].OrderExtend.printunit).FirstOrDefault();
+ if (sss != null)
+ {
+ eC_OrderBasics[i].yssldw = sss.Name;
}
}
}
@@ -142,6 +162,9 @@
{
this.spnRemark.InnerText = oA_DeliverPlan.Remark;
}
+ rptData.DataSource = eC_OrderBasics;
+ rptData.DataBind();
+
this.spnSumPrice.InnerText = SumPrice.ToString("#0.00");
this.spnSumPriceUpper.InnerText = GetChinaMoney(SumPrice);
--
Gitblit v1.9.1