username@email.com
2025-10-23 a5354b47d90532af412abbe25d8d9c671d0dd023
20251022  业绩查询增加当页合计和总的合计 完成
7个文件已修改
158 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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; }
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;//返回结果
        }
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");
                }
            }
        });
        /*
交易客户选中值发生改变
*/
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>&nbsp;
                                        <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>&nbsp;
                                    <span menu_member_case_id="case_chexiaoOrder" menu_member_case_name="撤销" class="a_under <%#Eval("OrderState").ToString() == "1"?"":"UnRecive" %>" onclick='onChexiao(<%#Eval("Keyid") %>)'>撤销</span>&nbsp; 
                                        <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>
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) {
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>
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;
        }