111

啊鑫

2025-09-04 8d771316d68f1523bcdf30c97d3a55107cb5ae56

111

 MES.Service/Modes/MesCustomer.cs

@@ -16,7 +16,7 @@
    /// <summary>
    /// ID 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal Id { get; set; }

    /// <summary>

 MES.Service/Modes/MesDepots.cs

@@ -17,8 +17,8 @@
    /// <summary>
    /// 仓库ID
    /// </summary>
    [SugarColumn(ColumnName = "depot_id", IsNullable = false)]
    public long DepotId { get; set; }
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal DepotId { get; set; }

    /// <summary>
    /// 仓库编码

 MES.Service/Modes/MesItemType.cs

@@ -18,8 +18,8 @@
    /// <summary>
    /// ID 
    ///</summary>
    [SugarColumn(ColumnName = "ID")]
    public long? Id { get; set; }
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal? Id { get; set; }

    /// <summary>
    /// 类型编码 

 MES.Service/Modes/MesItems.cs

@@ -18,8 +18,8 @@
    /// <summary>
    /// 物料ID 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    public long Id { get; set; }
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal Id { get; set; }

    /// <summary>
    /// 工厂 

 MES.Service/Modes/MesStaff.cs

@@ -18,8 +18,8 @@
    /// <summary>
    /// ID 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    public decimal Id { get; set; }
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal? Id { get; set; }

    /// <summary>
    /// 员工编码 

 MES.Service/Modes/MesSupplier.cs

@@ -18,7 +18,7 @@
    /// <summary>
    /// ID 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal Id { get; set; }

    /// <summary>

 MES.Service/Modes/MesUnit.cs

@@ -18,7 +18,7 @@
    /// <summary>
    /// BASEINFO 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal Id { get; set; }

    /// <summary>

 MES.Service/Modes/SysDepartment.cs

@@ -125,7 +125,7 @@
    /// <summary>
    /// 部门id 
    ///</summary>
    [SugarColumn(ColumnName = "id")]
    [SugarColumn(ColumnName = "id", IsIdentity = true)]
    public decimal Id { get; set; }

    /// <summary>

 MES.Service/service/BasicData/MesCustomerManager.cs

@@ -101,9 +101,10 @@

        var entity = new MesCustomer
        {
            Id = string.IsNullOrEmpty(customer.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : Convert.ToDecimal(customer.Id),
            // Id = string.IsNullOrEmpty(customer.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : Convert.ToDecimal(customer.Id),
            
            CustNo = customer.FNumber,
            CustSname = customer.FShortName,
            CustName = customer.FName,

 MES.Service/service/BasicData/MesDepotsManager.cs

@@ -42,7 +42,7 @@
    }

    // 更新仓库状态的方法
    private bool UpdateDepotStatus(SqlSugarScope db, long depotId,
    private bool UpdateDepotStatus(SqlSugarScope db, decimal depotId,
        string status)
    {
        var result = db.Updateable<MesDepots>()
@@ -93,9 +93,9 @@
        {
            DepotCode = depots.FNumber,
            DepotName = depots.FName,
            DepotId = string.IsNullOrEmpty(depots.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : Convert.ToInt32(depots.Id),
            // DepotId = string.IsNullOrEmpty(depots.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : Convert.ToInt32(depots.Id),
            IsFkc = depots.FAllowMinusQty,
            CreateBy = depots.FPrincipal,
            Depottype = depots.FStockProperty,

 MES.Service/service/BasicData/MesItemTypeManager.cs

@@ -51,7 +51,7 @@
        throw new NotImplementedException("插入失败");
    }

    private bool DeleteItemType(long? id)
    private bool DeleteItemType(decimal? id)
    {
        var deleteById = Db.Deleteable<MesItemType>()
            .Where(it => it.Id == id).ExecuteCommand();
@@ -65,9 +65,9 @@
    {
        var entity = new MesItemType
        {
            Id = string.IsNullOrEmpty(department.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : long.Parse(department.Id),
            // Id = string.IsNullOrEmpty(department.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : long.Parse(department.Id),
            Pgroup = department.FParentId,
            Tcode = department.FNumber,
            Tname = department.FName,

 MES.Service/service/BasicData/MesItemsManager.cs

@@ -89,12 +89,12 @@

    private MesItems GetMesItems(ErpItems item)
    {
        var id = string.IsNullOrEmpty(item.Id)
            ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            : long.Parse(item.Id);
        // var id = string.IsNullOrEmpty(item.Id)
        //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
        //     : long.Parse(item.Id);
        var entity = new MesItems
        {
            Id = id,
            // Id = id,
            Type = item.Type,
            ItemNo = item.FNumber,
            ItemName = item.FName,
@@ -138,8 +138,8 @@
            LossPercent = item.FLOSSPERCENT,
            MnemonicCode = item.FMnemonicCode,
            ExpPeriod = item.FExpPeriod,
            EItemId = id,
            ItemId = id,
            // EItemId = id,
            // ItemId = id,
            LastupdateDate = DateTime.Now,
            CreateDate = DateTime.Now,
            Company = "1000",

 MES.Service/service/BasicData/MesStaffManager.cs

@@ -346,8 +346,6 @@
        if (unit == null) throw new ArgumentNullException(nameof(unit));

        var entity = GetMesStaff(unit);
        unit.Id = entity.Id.ToString();
        var sysUser = GetUser(unit);
        //var mesStaffPositionLink = GetMesStaffPositionLink(unit);
        List<MesStaffPositionLink> mesStaffPositionLink = null;

@@ -359,19 +357,54 @@
                case "1": return UpdateStaffStatus(db, entity.Id, "B") ? 1 : 0;
                case "2":
                case "4":
                    return InsertOrUpdateStaff(db,
                        new List<SysUser> { sysUser },
                        new List<MesStaff> { entity }, mesStaffPositionLink)
                        ? 1
                        : 0;
                    // return InsertOrUpdateStaff(db,
                    //     new List<SysUser> { sysUser },
                    //     new List<MesStaff> { entity }, mesStaffPositionLink)
                    //     ? 1
                    //     : 0;
                    return InsertUser(db, entity) ? 1 : 0;
                case "3":
                    return DeleteStaff(db, new List<SysUser> { sysUser },
                        new List<MesStaff> { entity })
                        ? 1
                        : 0;
                    // return DeleteStaff(db, new List<SysUser> { sysUser },
                    //     new List<MesStaff> { entity })
                    //     ? 1
                    //     : 0;
                    return DeleteStaff(db, entity) ? 1 : 0;
                default: throw new ArgumentException($"不支持的类型: {unit.Type}");
            }
        }) > 0;
    }

    private bool InsertUser(SqlSugarScope db, MesStaff entity)
    {
        db.Deleteable<MesStaff>()
            .Where(s => s.Id == entity.Id)
            .ExecuteCommand();

        db.Deleteable<SysUser>()
            .Where(s => s.StaffId == entity.Id.ToString())
            .ExecuteCommand();

        var sysUser = GetUser(entity);
        if (entity.Id == null)
        {
            var id = db.Insertable<MesStaff>(entity).ExecuteReturnIdentity();
            sysUser.StaffId = id.ToString();
        }

        return db.Insertable(sysUser).ExecuteCommand() > 0;
    }

    private bool DeleteStaff(SqlSugarScope db, MesStaff entity)
    {
        var executeCommand = db.Deleteable<MesStaff>()
            .Where(s => s.Id == entity.Id)
            .ExecuteCommand();

        db.Deleteable<SysUser>()
            .Where(s => s.StaffId == entity.Id.ToString())
            .ExecuteCommand();

        return executeCommand > 0;
    }

    // 保存多个员工记录
@@ -545,7 +578,7 @@
    }

    // 更新员工状态
    private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,
    private bool UpdateStaffStatus(SqlSugarScope db, decimal? staffId,
        string status)
    {
        var result = db.Updateable<MesStaff>()
@@ -578,9 +611,9 @@
        {
            var entity = new MesStaff
            {
                Id = string.IsNullOrEmpty(staff.Id)
                    ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                    : Convert.ToDecimal(staff.Id),
                // Id = string.IsNullOrEmpty(staff.Id)
                //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                //     : Convert.ToDecimal(staff.Id),
                StaffNo = staff.FStaffNumber,
                StaffName = staff.FName,
                DepartmentName = staff.FPostDept,
@@ -626,30 +659,26 @@
    }

    // 将 ErpStaff 对象转换为 SysUser 对象
    private SysUser GetUser(ErpStaff staff)
    private SysUser GetUser(MesStaff entity)
    {
        if (staff == null) throw new ArgumentNullException(nameof(staff));
        if (entity == null) throw new ArgumentNullException(nameof(entity));

        try
        {
            return new SysUser
            {
                StaffId = staff.Id, // 确保Sid与员工ID一致
                StaffId = entity.Id.ToString(), // 确保Sid与员工ID一致
                IsStatus = true,
                Account = staff.FStaffNumber,
                UserName = staff.FName,
                Account = entity.StaffNo,
                UserName = entity.StaffName,
                Password = "E1ADC3949BA59ABBE56E057F2F883E", // 初始密码
                DepartNo = staff.FPostDept,
                Type = staff.Type,
                DepartNo = entity.DepartmentName,
                CreateTime = DateTime.Now
            };
        }
        catch (Exception ex)
        {
            Console.WriteLine($"转换ErpStaff到SysUser失败: {ex.Message}");
            Console.WriteLine(
                $"输入数据: {staff.Id}, {staff.FStaffNumber}, {staff.FName}");
            throw;
            throw new NotImplementedException(ex.Message);
        }
    }


 MES.Service/service/BasicData/MesSupplierManager.cs

@@ -90,9 +90,9 @@
    {
        var entity = new MesSupplier
        {
            Id = string.IsNullOrEmpty(supplier.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : Convert.ToDecimal(supplier.Id),
            // Id = string.IsNullOrEmpty(supplier.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : Convert.ToDecimal(supplier.Id),
            Type = supplier.Type,
            SuppNo = supplier.FNumber,
            SuppSname = supplier.FShortName,

 MES.Service/service/BasicData/MesUnitManager.cs

@@ -100,9 +100,9 @@

        var entity = new MesUnit
        {
            Id = string.IsNullOrEmpty(unit.Id)
                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
                : Convert.ToDecimal(unit.Id),
            // Id = string.IsNullOrEmpty(unit.Id)
            //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            //     : Convert.ToDecimal(unit.Id),
            Fnumber = unit.FNumber,
            Fname = unit.FName,
            Funitgroupid = unit.FUnitGroupId,

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -94,9 +94,9 @@
    // 将 ErpDepartment 对象转换为 SysDepartment 对象的方法
    private SysDepartment GetSysDepartment(ErpDepartment department)
    {
        var unixTimeSeconds = string.IsNullOrEmpty(department.Id)
            ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
            : Convert.ToDecimal(department.Id);
        // var unixTimeSeconds = string.IsNullOrEmpty(department.Id)
        //     ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
        //     : Convert.ToDecimal(department.Id);

        var fForbidStatus = department.FForbidStatus;
        if (department.FForbidStatus == "0")
@@ -112,8 +112,8 @@
        {
            Departmentcode = department.FNumber,
            Departmentname = department.FName,
            Departmentid = unixTimeSeconds,
            Id = unixTimeSeconds,
            // Departmentid = unixTimeSeconds,
            // Id = unixTimeSeconds,
            Depextr1 = department.FDeptProperty,
            Depextr2 = department.FGroup,
            Depextr3 = department.FWIPStockID,