From a3a8b2d5dbd0b4e17a8b8a9c0f2198a577fc31dc Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 15:26:58 +0800
Subject: [PATCH] 在“数码印刷”后面增加“业务经理打印”、在最后面增加“补单”
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs | 7 +++++++
CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 4 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs | 2 +-
CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs | 2 +-
CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs | 7 +++++--
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs
index af3fd62..35a5d53 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_SpecialOrdersBLL.cs
@@ -122,9 +122,9 @@
/// <param name="MemberId"></param>
/// <returns></returns>
public IEnumerable<Model.EC_SpecialOrders> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, string PrintName, string
- CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime)
+ CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime,string PSF_PressesDesk)
{
- return idal_IEC_SpecialOrdersDAL.SelectModelPage(pagination,MemberId,PrintName,CustomName,PSO_OrderNum,beginTime,endTime);
+ return idal_IEC_SpecialOrdersDAL.SelectModelPage(pagination,MemberId,PrintName,CustomName,PSO_OrderNum,beginTime,endTime, PSF_PressesDesk);
}
}
}
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs
index 6d44d8e..90db043 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_SpecialOrdersDAL.cs
@@ -59,6 +59,6 @@
/// <param name="MemberId"></param>
/// <returns></returns>
IEnumerable<Model.EC_SpecialOrders> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, string PrintName, string
- CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime);
+ CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime, string PSF_PressesDesk);
}
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
index f601522..418ea4f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_SpecialOrdersDAL.cs
@@ -388,7 +388,7 @@
/// <param name="MemberId"></param>
/// <returns></returns>
public IEnumerable<Model.EC_SpecialOrders> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, string PrintName, string
-CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime)
+CustomName, string PSO_OrderNum, DateTime? beginTime, DateTime? endTime, string PSF_PressesDesk)
{
try
{
@@ -419,7 +419,10 @@
{
Condition += string.Format(" and PSO_OrderNum like '%{0}%'", PSO_OrderNum);
}
-
+ if (!string.IsNullOrEmpty(PSF_PressesDesk))
+ {
+ Condition += string.Format(" and a.[Keyid] not in ( select [SpecialOrderId] from [EC_SpecialForums] where [PSF_PressesDesk] = '{0}')", PSF_PressesDesk);
+ }
return _dataBase.SelectModelPage<Model.EC_SpecialOrders>(pagination, " a.*,b.BuyerName as CustomName,b.DocumentName as PrintName ", " EC_SpecialOrders as a left join EC_OrderBasic as b on a.PO_OrderId = b.Keyid ", " PSO_OrderNum DESC ", " PSO_OrderNum DESC ", Condition);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 9e829a9..ed458ac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -1074,7 +1074,7 @@
//}
- else if ($(this).val().indexOf('鐩存帴淇垏') >= 0 || $(this).val().indexOf('鏁扮爜') >= 0) {
+ else if ($(this).val().indexOf('鐩存帴淇垏') >= 0 || $(this).val().indexOf('鏁扮爜') >= 0 || $(this).val().indexOf('琛ュ崟') >= 0 ) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -1429,7 +1429,7 @@
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
- else if ($(vv).val().indexOf('鐩存帴淇垏') >= 0 || $(vv).val().indexOf('鏁扮爜') >= 0) {
+ else if ($(vv).val().indexOf('鐩存帴淇垏') >= 0 || $(vv).val().indexOf('鏁扮爜') >= 0 || $(this).val().indexOf('琛ュ崟') >= 0 ) {
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
index 305e81b..5862dd9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx.cs
@@ -102,7 +102,7 @@
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
this.RepClientList.DataSource = bll_EC_SpecialOrdersBLL.SelectModelPage(pa, CurrentUser.MemberId,this.txtPrintName.Value,this.txtCustormerName.Value,this.txtPSO_OrderNum.Value, string.IsNullOrEmpty(this.txtBeginDate.Value) ? beginTime : Convert.ToDateTime(this.txtBeginDate.Value)
- , string.IsNullOrEmpty(this.txtEndDate.Value) ? endTime : MyConvert.GetDateTime(this.txtEndDate.Value)
+ , string.IsNullOrEmpty(this.txtEndDate.Value) ? endTime : MyConvert.GetDateTime(this.txtEndDate.Value), "琛ュ崟"
);
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
index 721d5c7..e60c48b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -98,6 +98,13 @@
{
var corporateClients = _oA_CorporateClientsBLL.GetModel(models[0].SellerId);
this.txtSupplierName.Value = corporateClients.OutVendorName;
+ if(corporateClients.OutVendorName == "鍏朵粬" || corporateClients.OutVendorName == "涓氬姟缁忕悊鎵撳嵃")
+ {
+
+ JavaScript.MessageBox("璇ヤ緵搴斿晢涓嶈兘鐢宠浠樻", this,true,false);
+ return;
+
+ }
this.selSuppliersss.Value = corporateClients.Keyid.ToString();
var sss = _OA_SuppliersBLL.getSupplierByFirmId(CurrentUser.MemberId, corporateClients.OutVendorName.Trim()).ToList();
--
Gitblit v1.9.1