From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +0800
Subject: [PATCH] 你们明天在那个公文管理公文管理那个操作操作界面增加一个审核， 好点审核呢，实际上是修改这个只有我才有一个权限， 只是只有我一个人，因为现在来看他们。相当于说， 没经过我审核，他们整些你看嘛，发你妈一些公文， 像狗屎一样，格式都不对头，在这儿乱在这儿乱写啊， 必须就是我，我审核，我点审核，你相就是复制一个修改过嘛， 相当于就是。好，必须是我，我点了审核好后头我修改好了， 提交好了才能发布。只要我没在审核里头的话，好，这个就发布不了 。好怀疑着呢，怀疑怀疑着来修改，还是在修改里头整？
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 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..7fbcf55 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,10 +101,10 @@
{
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");
+ this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
@@ -107,21 +114,19 @@
+ this.spnRemark.InnerText = oA_DeliverPlan.Remark;
-
+
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)
{
@@ -130,18 +135,38 @@
if (m_EC_AwbInfo != null)
{
- this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+ if (string.IsNullOrWhiteSpace(this.spnRemark.InnerText))
+ {
+ 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;
}
}
}
- else
- {
- 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