增加一个完结时间，如果下次打开，就按完结时间计算合同金额

username@email.com

2025-09-15 58cc59639e3ca32896d6db5d0c261ff63848a30d

增加一个完结时间，如果下次打开，就按完结时间计算合同金额

          ALTER TABLE [dbo].[OA_CorporateClients]  ADD  [WanjieTime] [datetime] NULL;
GO

  update   [OA_CorporateClients] set [WanjieTime] = LastUpdateTime where Shifouwanjie = 1

 CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs

@@ -85,6 +85,24 @@
            }
        }


        /// <summary>
        /// 修改合作客户
        /// </summary>
        /// <param name="rType"></param>
        /// <returns></returns>
        public bool UpdateWanjie(CY.Model.OA_CorporateClients m_OA_CorporateClients)
        {
            try
            {
                return _IOA_CorporateClientsDal.UpdateWanjie(m_OA_CorporateClients);
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }

        /// <summary>
        /// 设置自动外协
        /// </summary>

 CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs

@@ -389,5 +389,14 @@
        /// <returns></returns>
        OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid);



        /// <summary>
        /// 修改完结
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        bool UpdateWanjie(Infrastructure.Domain.IAggregateRoot model);

    }
}

 CY_ECommercePlatform/CY.Model/OA/OA_CorporateClients.cs

@@ -520,6 +520,17 @@
                return _lastupdatetime;
            }
        }

        /// <summary>
        /// 最后修改时间
        /// </summary>
        public DateTime? WanjieTime
        {
            set;
            get;
            
        }

        /// <summary>
        /// 操作人
        /// </summary>
@@ -1555,6 +1566,11 @@
                this.JieJiaRiWiHu = isChange ? MyConvert.ConvertToBoolean(value) : JieJiaRiWiHu;
                theValue = this.JieJiaRiWiHu;
            }
            else if ("WanjieTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 85)
            {
                this.WanjieTime = isChange ? MyConvert.ConvertToDateTime(value) : WanjieTime;
                theValue = this.WanjieTime;
            }
            return theValue;
        }


 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs

@@ -1580,7 +1580,7 @@
left join [Sys_Dictionary] expiretype on expiretype.DicType='到期时间' and expiretype.MeanValue = oc.Expiretype
left join ( select  ob.BuyerId,sum(ob.SumPrice) SumPrice,sum(ts.PayedMoney)  PayedMoney ,COUNT(*) as shuliang
  from EC_OrderBasic ob Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) Inner Join Pay_TradingSingle as ts On(ob.Keyid = ts.OrderId)
  left join EC_AwbInfo ea  on ob.Keyid = ea.Keyid
  left join EC_AwbInfo ea  on ob.Keyid = ea.Keyid  Inner Join OA_CorporateClients occ  on ob.BuyerId = occ.Keyid  where   (occ.WanjieTime IS NULL OR DATEDIFF(DAY,occ.WanjieTime,ob.CreateTime)>=0) 
   
  group by ob.BuyerId ) ob  on oc.Keyid = ob.BuyerId


 CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs

@@ -265,6 +265,64 @@
            return true;
        }



        /// <summary>
        /// 修改完结
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateWanjie(Infrastructure.Domain.IAggregateRoot model)
        {
            Model.OA_CorporateClients trueModel = model as Model.OA_CorporateClients;
            if (trueModel == null)
            {
                return false;
            }

            SqlParameter par = null;
            if (trueModel.LastOrderTime.HasValue)
            {
                par = new SqlParameter("@LastOrderTime", trueModel.LastOrderTime.Value);
            }
            else
            {
                par = new SqlParameter("@LastOrderTime", DBNull.Value);
            }
            SqlParameter par1 = null;
            if (trueModel.WanjieTime.HasValue)
            {
                par1 = new SqlParameter("@WanjieTime", trueModel.WanjieTime.Value);
            }
            else
            {
                par1 = new SqlParameter("@WanjieTime", DBNull.Value);
            }
           
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                    new SqlParameter("@Keyid",trueModel.Keyid),
                    
                    par,
                    
                       par1,
                       
                            new SqlParameter("@Shifouwanjie",trueModel.Shifouwanjie??0) ,
            };
            string sql = "Update [OA_CorporateClients] Set [Shifouwanjie]=@Shifouwanjie,[WanjieTime]=@WanjieTime,[LastOrderTime]=@LastOrderTime  where [Keyid] =@Keyid ";

            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }


        /// <summary>
        /// 转移客户
        /// </summary>

 CY_ECommercePlatform/CY.WebForm/Pages/business/Caigoufukuanshenqing.aspx.cs

@@ -277,8 +277,8 @@

                            m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                            m_OA_WorkPlan.PlanComplany = id.ToString();
                            m_OA_WorkPlan.PlanContent = orderNoStr + " 采购付款申请。订单金额："+ this.ordernjine.InnerText + ",抹零金额：" + this.txtmolingmoney.Value + ", 收款单位：" + _SupplierName + ", 户名：" + oA_Fukuanshenqing.Huming;
                            m_OA_WorkPlan.PlanDataType = 16;
                            m_OA_WorkPlan.PlanContent = " 采购付款申请。订单金额："+ this.ordernjine.InnerText + ",抹零金额：" + this.txtmolingmoney.Value + ", 收款单位：" + _SupplierName + ", 户名：" + oA_Fukuanshenqing.Huming;//+ orderNoStr
                        m_OA_WorkPlan.PlanDataType = 16;
                            m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
                            m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;
                            m_OA_WorkPlan.PlanRemark = oA_Fukuanshenqing.remark;

 CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs

@@ -360,14 +360,14 @@
                m_OA_CorporateClients.Shifouwanjie = 1;

                m_OA_CorporateClients.LastUpdateTime = DateTime.Now;
                m_OA_CorporateClients.WanjieTime = DateTime.Now;


 

                        #region 添加或编辑
                #region 添加或编辑

                         
                            bool result = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);//更新信息

                bool result = bll_OA_CorporateClientsBLL.UpdateWanjie(m_OA_CorporateClients);//更新信息
                            if (result)
                                JavaScript.MessageBox("完结成功", this, true, true);
                            else
@@ -413,13 +413,13 @@

                m_OA_CorporateClients.LastUpdateTime = DateTime.Now;


                m_OA_CorporateClients.WanjieTime = DateTime.Now;


                #region 添加或编辑


                bool result = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);//更新信息
                bool result = bll_OA_CorporateClientsBLL.UpdateWanjie(m_OA_CorporateClients);//更新信息
                if (result)
                    JavaScript.MessageBox("完结成功", this, true, true);
                else

 CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs

@@ -270,7 +270,7 @@

                            m_OA_WorkPlan.Operator = CurrentUser.ShortName;
                            m_OA_WorkPlan.PlanComplany = id.ToString();
                            m_OA_WorkPlan.PlanContent = orderNoStr + "，订单金额：" + this.ordernjine.InnerText + ",抹零金额：" + this.txtmolingmoney.Value + ", 收款单位：" + _SupplierName + "。" ;
                            m_OA_WorkPlan.PlanContent =  "订单金额：" + this.ordernjine.InnerText + ",抹零金额：" + this.txtmolingmoney.Value + ", 收款单位：" + _SupplierName + ","+ orderNoStr +"。" ;
                            m_OA_WorkPlan.PlanDataType = 14;
                            m_OA_WorkPlan.PlanMoney = oA_Fukuanshenqing.Fukuanmoney;
                            m_OA_WorkPlan.RewardMoney = oA_Fukuanshenqing.Molingmoney;

 CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs

@@ -245,10 +245,10 @@
                                    firmAccountRecord.RecordTypeId = 2;//支出
                                    firmAccountRecord.Remark = this.txtRemark.Value;
                                    firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
                                    firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
                                    firmAccountRecord.ResidualAmount = firmAccount.Balance - firmAccountRecord.Money; ;

                                    firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
                                    firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
                                    firmAccount.AllExpenses = firmAccountRecord.Money + firmAccount.AllExpenses;
                                    firmAccount.Balance = firmAccount.Balance - firmAccountRecord.Money;
                                    ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
                                    if (ssss)
                                    {

 CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx

@@ -150,7 +150,7 @@
                            <th width="70" style="text-align: center">
                                请示类别
                            </th>
                            <th  width="300"  style="text-align: center">
                            <th    style="text-align: center">
                                请示内容
                            </th>
                             <th width="70" style="text-align: center">
@@ -182,7 +182,7 @@
                            <%#Eval("PlanDataTypeName")%>
                        </td>
                        <td style="text-align: center">
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>
                        </td>
                        <td style="text-align: center">
                            <%#Eval("PlanMoney", "{0:F2}")%>

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx

@@ -116,7 +116,7 @@
                            <th width="70" style="text-align: center">
                                请示类别
                            </th>
                             <th  width="300"  style="text-align: center">
                             <th    style="text-align: center">
                                请示内容
                            </th>
                             <th width="70" style="text-align: center">
@@ -148,7 +148,7 @@
                            <%#Eval("PlanDataTypeName")%>
                        </td>
                        <td style="text-align: center">
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 150))) %>
                            <%# String.Format("{0}", Eval("PlanContent").ToString().Substring(0, Math.Min(Eval("PlanContent").ToString().Length, 50))) %>

                        </td>
                        <td style="text-align: center">