增加川印设备维修回写

小飞侠

2025-10-21 595df5dac0a782bfdadab766b4dd62d326b0a383

增加川印设备维修回写

 .gitignore

@@ -46,3 +46,4 @@
cylsg/ECTESTOA/bin/
>>>>>>> cyronghe
*.log
sqlsugar 代码生成器/

 cylsg/cylsg.Application/CyOS/CyOSBaoXiaoJingLiController.cs

@@ -166,7 +166,7 @@
                        ApprovalContent = param.ApprovalContent,
                        ApprovalStatus = param.ApprovalStatus,
                        ApprovalTime = DateTime.Now,
                        ///总经理审批为2
                        //总经理审批为2
                        Buzhou = 2,
                        CreateTime = DateTime.Now,
                        Operator = Permissions.Name,
@@ -196,6 +196,15 @@


                await _SugarClient.Updateable(data).ExecuteCommandAsync();

                //设置设备weixiu状态为拒绝
                var shenpis = await _SugarClient.Queryable<OA_ShebeiWeixiu>().Where(x => x.FukuanShebeiId == data.Keyid).FirstAsync();
                if (shenpis != null)
                {
                    shenpis.ApprovalStatus =(int ) data.ApprovalStatus;

                    await _SugarClient.Updateable(shenpis).ExecuteCommandAsync();
                }
                await _SugarClient.AsTenant().CommitTranAsync();
                return true;
            }
@@ -284,7 +293,14 @@
                    item.ApprovalContent = param.ApprovalContent;
                    item.LastUpdateTime = DateTime.Now;

                    //设置设备weixiu状态
                    var shenpis = await _SugarClient.Queryable<OA_ShebeiWeixiu>().Where(x => x.FukuanShebeiId == item.Keyid).FirstAsync();
                    if (shenpis != null)
                    {
                        shenpis.ApprovalStatus = (int)item.ApprovalStatus;

                        await _SugarClient.Updateable(shenpis).ExecuteCommandAsync();
                    }


                    await _SugarClient.Updateable(item).ExecuteCommandAsync();

 cylsg/cylsg.Application/CyOS/CyOSBaoXiaoZHuGuanController.cs

@@ -2,6 +2,7 @@
using cylsg.Model.utilityViewModel;
using ECTESTOA;
using Furion.LinqBuilder;
using Models;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -224,6 +225,15 @@
                        data.Operator = Permissions.Name;
                       await  _SugarClient.Updateable(data).ExecuteCommandAsync();

                        //设置设备weixiu状态为拒绝
                        var shenpis = await _SugarClient.Queryable<OA_ShebeiWeixiu>().Where(x => x.FukuanShebeiId == data.Keyid).FirstAsync();
                        if (shenpis != null)
                        {
                            shenpis.ApprovalStatus = (int )PlanStatusType.No;

                            await _SugarClient.Updateable(shenpis).ExecuteCommandAsync();
                        }

                    }

                    shenpi = new OaWorkPlanShenpi()

 cylsg/cylsg.Model/ECTEModel/OA_ShebeiWeixiu.cs

New file
@@ -0,0 +1,172 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace Models
{
    /// <summary>
    /// 设备维修表
    ///</summary>
    [SugarTable("OA_ShebeiWeixiu")]
    public class OA_ShebeiWeixiu
    {
        
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Keyid" ,IsPrimaryKey = true,IsIdentity = true) ]
        public int Keyid  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="MemberId" ) ]
        public Guid? MemberId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="ShebeiId" ) ]
        public int? ShebeiId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="WeixiuTime" ) ]
        public DateTime? WeixiuTime  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="CateId" ) ]
        public int? CateId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Anzhuangdidian" ) ]
        public string? Anzhuangdidian  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Name" ) ]
        public string? Name  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Remark" ) ]
        public string? Remark  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="WeixiuPrice" ) ]
        public decimal? WeixiuPrice  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Zerenren" ) ]
        public int? Zerenren  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="ZerenrenName" ) ]
        public string? ZerenrenName  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="DanzePrice" ) ]
        public decimal? DanzePrice  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="WeixiuShebeiId" ) ]
        public int? WeixiuShebeiId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="FukuanShebeiId" ) ]
        public int? FukuanShebeiId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="FukuanshenqingId" ) ]
        public int? FukuanshenqingId  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Shifoufufei" ) ]
        public int? Shifoufufei  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="CreateTime" ) ]
        public DateTime? CreateTime  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Creator" ) ]
        public string? Creator  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="LastUpdateTime" ) ]
        public DateTime? LastUpdateTime  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Operator" ) ]
        public string? Operator  { get; set;  } 
     
        /// <summary>
        /// 备  注:审批结果
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="ApprovalStatus" ) ]
        public int? ApprovalStatus  { get; set;  } 
     
        /// <summary>
        /// 备  注:
        /// 默认值:
        ///</summary>
        [SugarColumn(ColumnName="Fukuanfangshi" ) ]
        public string? Fukuanfangshi  { get; set;  } 
    

    }
    
}