From a5354b47d90532af412abbe25d8d9c671d0dd023 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 23 十月 2025 08:46:13 +0800
Subject: [PATCH] 20251022 业绩查询增加当页合计和总的合计 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx | 40 +++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs | 40 ++++++++++++
CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 29 +++++++++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 16 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 29 +++++++++
7 files changed, 153 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs b/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
index c6b9569..028f9fa 100644
--- a/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
+++ b/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
@@ -31,6 +31,8 @@
public decimal? heji1 { get; set; }
public decimal? heji2 { get; set; }
public decimal? heji3 { get; set; }
+ public decimal? heji4 { get; set; }
+ public decimal? heji5 { get; set; }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index 624a1f1..93627ef 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -1589,6 +1589,22 @@
fromSouce += " )as t ";
+
+
+
+
+ var ssss = _dataBase.SelectModel<Model.OA_DeliverPlan>(" sum(t.Contractmoney) as Contractmoney,sum(t.SumPrice) as SumPrice,sum(t.PayedMoney) as PayedMoney ", fromSouce);
+ if (ssss.Count > 0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.Contractmoney ?? 0;
+ pagination.heji2 = aaaaa.SumPrice ?? 0;
+ pagination.heji3 = aaaaa.UnorderMoney ?? 0;
+ pagination.heji4 = aaaaa.PayedMoney ?? 0;
+ pagination.heji5 = aaaaa.UnPayedMoney;
+ }
+
+
var result = _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, selectTarget, fromSouce, " CreateTime DESC ");//鎵ц鏌ヨ
return null == result ? null : result;//杩斿洖缁撴灉
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index a7a6d59..cd70665 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -154,8 +154,18 @@
$("#PSF_Typesetting").live("change", function () {
+
+
+ if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 ) {
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増" || $("#PMS_ChromaticNumber").val() == "2") {
+ $("#CTPCount").val("2");
+ } else {
+ $("#CTPCount").val("1");
+ }
+ }
+
- if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 || $("#selPMS_Machine").val().indexOf('榛戠櫧') >= 0) {
+ if ( $("#selPMS_Machine").val().indexOf('榛戠櫧') >= 0) {
if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
$("#CTPCount").val("2");
} else {
@@ -174,6 +184,23 @@
});
+
+
+ $("#PMS_ChromaticNumber").live("change", function () {
+
+ if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 ) {
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増" || $("#PMS_ChromaticNumber").val() == "2") {
+ $("#CTPCount").val("2");
+ } else {
+ $("#CTPCount").val("1");
+ }
+ }
+
+
+
+ });
+
+
/*
浜ゆ槗瀹㈡埛閫変腑鍊煎彂鐢熸敼鍙�
*/
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index e3b3aab..d626664 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -466,7 +466,7 @@
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "閫佽揣") ? "鈭�" : "脳"%></span>
</td>
<td>
- <span menu_member_case_id="case_outAfterOrder" menu_member_case_name="淇敼" class="a_under <%#Eval("OrderState").ToString() == "1"||Eval("OrderState").ToString() == "2"?"":"UnRecive" %>" onclick='outAfterOrder(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>淇敼</span>
+ <span menu_member_case_id="case_outAfterOrder" menu_member_case_name="淇敼" class="a_under <%#Eval("OrderState").ToString() == "1"||Eval("OrderState").ToString() == "2"||Eval("OrderState").ToString() == "3"?"":"UnRecive" %>" onclick='outAfterOrder(<%#Eval("Keyid") %>,<%#Eval("OldOrderId") %>)'>淇敼</span>
<span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="鎾ら攢" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#Eval("Keyid") %>)'>鎾ら攢</span>
<span menu_member_case_id="case_deleteOrder" menu_member_case_name="鍒犻櫎" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onDelete(<%#Eval("Keyid") %>)'>鍒犻櫎</span>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 741390c..7277fc1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -784,7 +784,16 @@
$("select[name='PSF_Typesetting']").live("change", function () {
var value_SelWaerId = $(this).attr("value_ppwaerid");
- if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0 || $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('榛戠櫧') >= 0) {
+ if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0 ) {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増" || $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val() == "鍙岃壊") {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+ } else {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+ }
+ }
+
+
+ if ( $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('榛戠櫧') >= 0) {
if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
} else {
@@ -803,6 +812,24 @@
});
+
+
+
+ $("select[name='PSF_PrintedColorPositive']").live("change", function () {
+ var value_SelWaerId = $(this).attr("value_selspec");
+ if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0) {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増" || $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val() == "鍙岃壊") {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
+ } else {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+ }
+ }
+
+
+ });
+
+
+
$("select[name='PSF_PressesDesk']").live("change", function () {
var value_SelWaerId = $(this).attr("value_selspec");
if ($(this).val().indexOf('鍏紑') >= 0) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
index dd7d5a2..9e815a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx
@@ -256,6 +256,46 @@
</tr>
</ItemTemplate>
<FooterTemplate>
+ <tr class="StatisticsMoney">
+ <td colspan="8" class="ali03">
+ 褰撳墠椤电粺璁★細
+ </td>
+ <td class="ali01">
+ <%=hetongjine %>
+ </td>
+ <td class="ali01">
+ <%=xiadanjine %>
+ </td>
+ <td class="ali01">
+ <%=weixiadanjine %>
+ </td>
+ <td class="ali01">
+ <%=huikuanjine %>
+ </td>
+ <td class="ali01" >
+ <%=weishoukuanjine %>
+ </td>
+ </tr>
+ <tr class="StatisticsMoney">
+ <td colspan="8" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01">
+ <%=hetongjineheji %>
+ </td>
+ <td class="ali01">
+ <%=xiadanjineheji %>
+ </td>
+ <td class="ali01">
+ <%=weixiadanjineheji %>
+ </td>
+ <td class="ali01">
+ <%=huikuanjineheji %>
+ </td>
+ <td class="ali01" >
+ <%=weishoukuanjineheji %>
+ </td>
+ </tr>
</table>
</FooterTemplate>
</asp:Repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
index 52d1bcd..10b0bf7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs
@@ -22,6 +22,17 @@
OA_CustomerApplyBLL bll_OA_CustomerApplyBLL = null;
EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
+ public string hetongjine = "";
+ public string xiadanjine = "";
+ public string weixiadanjine = "";
+ public string huikuanjine = "";
+ public string weishoukuanjine = "";
+
+ public string hetongjineheji = "";
+ public string xiadanjineheji = "";
+ public string weixiadanjineheji = "";
+ public string huikuanjineheji = "";
+ public string weishoukuanjineheji = "";
//鍒濆鍖�
public XiaoshoujixiaoList()
@@ -41,8 +52,9 @@
if (!IsPostBack)
{
BindProvince();
- BindList();
InitialSelectData();
+ BindList();
+
}
@@ -75,6 +87,7 @@
this.selShifouwanjie.DataValueField = "MeanValue";
this.selShifouwanjie.DataBind();
this.selShifouwanjie.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selShifouwanjie.Value = "2";
}
@@ -85,7 +98,7 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_EC_OrderBLL.GetxiaoshouchaxunList(pa,
+ var oA_DeliverPlans = bll_EC_OrderBLL.GetxiaoshouchaxunList(pa,
CurrentUser.MemberId,
this.selectProvince.SelectedItem.Text.Replace("鍏ㄩ儴", ""),
this.selectCity.SelectedItem.Text.Replace("鍏ㄩ儴", ""),
@@ -102,6 +115,29 @@
this.txtOrderMoney.Value,
this.txtLastOrderTime.Value
);
+ var hetongjinedecimal = oA_DeliverPlans.Sum(x => x.Contractmoney) ?? 0;
+ var xiadanjinedecimal = oA_DeliverPlans.Sum(x => x.SumPrice) ?? 0;
+ var weixiadanjinedecimal = oA_DeliverPlans.Sum(x => x.UnorderMoney) ?? 0;
+ var huikuanjinedecimal = oA_DeliverPlans.Sum(x => x.PayedMoney) ?? 0;
+
+
+
+
+ hetongjine = hetongjinedecimal.ToString("F2");
+ xiadanjine = xiadanjinedecimal.ToString("F2");
+ weixiadanjine = weixiadanjinedecimal.ToString("F2");
+ huikuanjine = huikuanjinedecimal.ToString("F2");
+ weishoukuanjine = oA_DeliverPlans.Sum(x => x.UnPayedMoney).ToString("F2");
+
+
+ hetongjineheji = pa.heji1.Value.ToString("0.00"); ;
+ xiadanjineheji = pa.heji2.Value.ToString("0.00"); ;
+ weixiadanjineheji = pa.heji3.Value.ToString("0.00"); ;
+ huikuanjineheji = pa.heji4.Value.ToString("0.00"); ;
+ weishoukuanjineheji = pa.heji5.Value.ToString("0.00"); ;
+
+
+ this.RepClientList.DataSource = oA_DeliverPlans;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
--
Gitblit v1.9.1