From dc7b6c75f98b6924b7e091ee7ac6551470652d78 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 20 一月 2025 09:07:29 +0800
Subject: [PATCH] 修改订单单位
---
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 8 ++++----
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 4 ++++
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 8 ++++++--
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs | 4 ++--
15 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index b86a807..e487dc5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,8 +165,12 @@
{
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- var ssss = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
- if (ssss.Length > 500)
+ var ssss = /*_inquiryCommonModel.PrintDemand +*/ _inquiryCommonModel.AfterWorksDemand;
+ if(_eC_OrderBasic.PrintTypeId == -1)
+ {
+ ssss = _inquiryCommonModel.PrintDemand;
+ }
+ if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
{
ssss.Substring(0,499);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 12bc118..7938c51 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -383,7 +383,7 @@
<th style="text-align: center;">
鍗颁欢鍚嶇О
</th>
- <th style="width:100px;">
+ <th style="width:50px;">
鍚堝悓搴忓彿
</th>
<th width="36">
@@ -488,7 +488,7 @@
</td>
<td style="text-align: center;">
<div style="word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
<td>
@@ -498,12 +498,12 @@
<%#Eval("PrintType.PrintName")%>
</td>
<td style="text-align: center; color:<%#(Eval("OrderExtend.ExigencyCaseId").ToString()=="-1" && int.Parse(Eval("OrderState").ToString()) <5 && int.Parse(Eval("OrderState").ToString()) > 0)?"red":""%>;">
- <span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >15? (Eval("DocumentName").ToString().Substring(0,15)+".."):Eval("DocumentName").ToString() %></span>
+ <span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >22? (Eval("DocumentName").ToString().Substring(0,22)+".."):Eval("DocumentName").ToString() %></span>
</td>
<td style="text-align: center;">
<div style="word-wrap: break-word; text-align:justify;">
- <a href='javascript:void(0)' title='<%#Eval("Duiyinghetongbianhao").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("Duiyinghetongbianhao").ToString().Length > 20 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 20) + "..") : Eval("Duiyinghetongbianhao").ToString()%></a>
+ <a href='javascript:void(0)' title='<%#Eval("Duiyinghetongbianhao").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("Duiyinghetongbianhao").ToString().Length > 5 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 5)) : Eval("Duiyinghetongbianhao").ToString()%></a>
</div>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
index beb743e..3788b09 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 2);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "2";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
index f317f39..507e9fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 4);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "4";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
index f5cde40..35bb68b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == 3);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "3";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
index 35c519d..78bd3b5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
@@ -19,7 +19,7 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 1);
this.ysUnit.DataBind();
this.ysUnit.Value = "1";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
index 36a1661..4e63ba9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
@@ -19,7 +19,7 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 1);
this.ysUnit.DataBind();
this.ysUnit.Value = "1";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
index 0644c9b..baafd28 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 4);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "4";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 752cd93..a32cda7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -2457,6 +2457,10 @@
}
if (model.PrintTypeId == 27)
{
+ if (!string.IsNullOrEmpty(model.JTWZ))
+ {
+ afterWorkStr = model.JTWZ ;
+ }
if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
{
afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
index 629d311..51caf20 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 2);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "2";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
index 5cef432..760e8dc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
@@ -19,7 +19,7 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 1);
this.ysUnit.DataBind();
this.ysUnit.Value = "1";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
index ec5420c..992442d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 4);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "4";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
index ad2ca7a..55cb7b8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 3);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "3";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
index 86e5085..0cc6be6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
@@ -20,7 +20,7 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == 1);
this.ysUnit.DataBind();
this.ysUnit.Value = "1";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
index 41d22ab..5b978a8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
@@ -19,9 +19,9 @@
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == 4);
this.ysUnit.DataBind();
- this.ysUnit.Value = "1";
+ this.ysUnit.Value = "4";
}
}
}
--
Gitblit v1.9.1