username@email.com
2025-10-29 2a8f5dfa8bfa910829d057d6ba76778aa12880ca
20251028  收款提醒修改  完成未发布  20251028  作业本详情样式修改   完成未发布
10个文件已修改
93 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_CuikuanjiluBLL.cs
@@ -88,6 +88,18 @@
            return _IOA_CuikuanjiluDAL.GetModelByKeyid( BuyerId, shoukuanshijian);
        }
        /// <summary>
        /// 获取全部合作客户
        /// </summary>
        /// <param name="Keyid">主键id</param>
        /// <returns></returns>
        public int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "")
        {
            return _IOA_CuikuanjiluDAL.GetCountByKeyid(BuyerId, shoukuanshijian);
        }
        /// <summary>
        /// 删除合作客户
        /// </summary>
CY_ECommercePlatform/CY.IDAL/OA/IOA_CuikuanjiluDAL.cs
@@ -18,5 +18,13 @@
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        IEnumerable<OA_Cuikuanjilu> GetModelByKeyid( Guid? BuyerId, string shoukuanshijian = "");
        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "");
    }
}
CY_ECommercePlatform/CY.Model/OA/OA_Cuikuanjilu.cs
@@ -72,6 +72,12 @@
            set;
        }
        public int?  Count
        {
            get;
            set;
        }
        #endregion Model
        #region Visiter
@@ -145,8 +151,12 @@
                this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
                theValue = this.LastUpdateTime;
            }
            else if ("Count".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
            {
                this.Count = isChange ? MyConvert.ConvertToInt32(value) : Count;
                theValue = this.Count;
            }
            return theValue;
        }
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -347,6 +347,16 @@
            set;
        }
        /// <summary>
        /// 催款记录
        /// </summary>
        public string Cuikuanjilu
        {
            get;
            set;
        }
        /// <summary>
        /// 未付款
        /// </summary>
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CuikuanjiluDAL.cs
@@ -130,6 +130,33 @@
        /// <summary>
        /// 根据编号获得信息
        /// </summary>
        /// <param name="Keyid">编号</param>
        /// <returns></returns>
        public int GetCountByKeyid(Guid? BuyerId, string shoukuanshijian = "")
        {
            try
            {
                string condition = "  ";
                condition = " BuyerId='" + BuyerId + "' and  shoukuanshijian='" + shoukuanshijian + "'";
                //  return null;//错误数据返会空
                IList<OA_Cuikuanjilu> result = _dataBase.SelectModel<OA_Cuikuanjilu>(" count(*) as Count ", "OA_Cuikuanjilu", condition) as IList<OA_Cuikuanjilu>;//执行查询
                return (null == result || result.Count == 0) ? 0 : result[0].Count.Value;//返回结果
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        /// <summary>
        /// 全部查询
        /// </summary>
        /// <param name="query"></param>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
@@ -10,7 +10,7 @@
        //专版施工
        function specialOrder(orderid, num) {
            if (num == "has") {
                top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "专版施工", Width: 1100, Height: 700 });
                top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "专版施工", Width: 1100, Height: 780 });
            }
        }
        //整单外协
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderList.aspx
@@ -14,7 +14,7 @@
        }
        //编辑施工单
        function EditModel(orderid) {
            top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "编辑施工单", Width: 1100, Height: 700 });
            top.Dialog.open({ URL: "/Pages/business/AgSpecialOrderEdit.aspx?orderid=" + orderid, Title: "编辑施工单", Width: 1100, Height: 780 });
        }
        //删除
        function onDelete(keyid) {
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx
@@ -197,7 +197,7 @@
                                </td>
                                  <td  menu_member_case_id="case_Cuikuanjilu" menu_member_case_name="催款记录" >
                                   
                                       <a href='javascript:void(0)' title='点击添加催款记录' class='a_under' onclick='ViewCuikuanjilu("<%#Eval("BuyerId")%>","<%#Eval("shoukuanshijian")%>")'> 查看记录   </a>
                                       <a href='javascript:void(0)' title='点击添加催款记录' class='a_under' onclick='ViewCuikuanjilu("<%#Eval("BuyerId")%>","<%#Eval("shoukuanshijian")%>")'> <%#Eval("Cuikuanjilu") %>   </a>
                                    
                                   
                                </td>
CY_ECommercePlatform/CY.WebForm/Pages/financial/UnpayOrderList.aspx.cs
@@ -28,6 +28,7 @@
        EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
        Sys_CitySiteBLL bll_Sys_CitySiteBLL = null;
        EC_OrderBLL eC_OrderBLL = null;
        OA_CuikuanjiluBLL oA_CuikuanjiluBLL = null;
        //初始化
@@ -41,6 +42,7 @@
            bll_EC_MemberBasicBLL = new EC_MemberBasicBLL();
            bll_Sys_CitySiteBLL = new Sys_CitySiteBLL();
            eC_OrderBLL = new EC_OrderBLL();
            oA_CuikuanjiluBLL = new OA_CuikuanjiluBLL();
        }
        protected void Page_Load(object sender, EventArgs e)
@@ -118,8 +120,12 @@
                 this.selBusinessManagerId.Value,
                  this.selAccountManagerId.Value);
            foreach (var oA_DeliverPlan in oA_DeliverPlans1)
            {
                var ddd = oA_CuikuanjiluBLL.GetCountByKeyid(oA_DeliverPlan.BuyerId, oA_DeliverPlan.shoukuanshijian);
                oA_DeliverPlan.Cuikuanjilu = ddd.ToString();
            }
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -689,9 +689,9 @@
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">单价</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">金额</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">封面纸张</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
                    //printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">内芯纸张</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
                    //printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">印刷要求</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">页码</td>";
                    printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">装订</td>";
                    printDemand += "</tr>";
@@ -837,7 +837,7 @@
                                inquiryWorkBookModel.FengMianYaoqiuTxt = FengMianYaoqiu.Name;
                            }
                            //printDemand += ",印刷要求:" + inquiryWorkBookModel.FengMianYaoqiuTxt + "";
                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
                           // printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.FengMianYaoqiuTxt + "</td>";
                        }
                        if (request["WorkBookNeiXinga" + (i + 1)] != null)
@@ -861,7 +861,7 @@
                                inquiryWorkBookModel.NeiXingYaoqiuTxt = NeiXingYaoqiu.Name;
                            }
                            //printDemand += ",印刷要求:" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "";
                            printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
                           // printDemand += "<td style=\"text-align:center;border: 1px solid #999999;\">" + inquiryWorkBookModel.NeiXingYaoqiuTxt + "</td>";
                        }
                        if (request["WorkBookpageNuma" + (i + 1)] != null)