修改报销部分逻辑

移动系统liao

2025-01-24 f4a0b32daa9e021227707bcfb70b67738bd1b000

 cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs

@@ -41,6 +41,7 @@
            Expression<Func<OaWorkPlan, bool>> SearchList = (x) => true;

            //川印工作单
            SearchList = SearchList.And(x => x.ApprovalStatus != PlanStatusType.Uncommitted);
            SearchList = SearchList.And(x => x.MemberId == _OAServices.firmId);
            SearchList = SearchList.And(x => x.PlanType == 3);
            SearchList = SearchList.And(x => x.PlanDataType == 17);
@@ -168,6 +169,10 @@
                throw Oops.Oh("没有找到报销单");
            if (data.ApprovalStatus != null && data.ApprovalStatus != PlanStatusType.unApproval)
                throw Oops.Oh("报销单已经批复完毕");
            if(data.ApprovalStatus== PlanStatusType.Uncommitted)
            {
                throw Oops.Oh("报销单未提交不可审批");
            }
            OaWorkPlanShenpi shenpi = data.OaWorkPlanShenpis.Where(x => x.ApprovalStaffId == Permissions.MemberId&&x.Buzhou==1).FirstOrDefault();
             if (shenpi!=null)
            {
@@ -178,6 +183,13 @@
            }
             else
            {
    

                data.RewardResult = param.RewardResult;
                data.PlanContent = param.PlanContent;
                if (param.PlanMoney > 0 && param.PlanMoney <= data.PlanMoney)
                    data.PlanMoney = param.PlanMoney;

              await   _SugarClient.AsTenant().BeginTranAsync();
                try
                {