部门信息

快乐的昕的电脑

2025-11-27 79fec1a2ae702629272c2f347b2fb0fbe5186358

部门信息

 MES.Service/Dto/webApi/ErpDepartment.cs

@@ -2,9 +2,9 @@

public class ErpDepartment
{
    public string Id { get; set; }
    public string? Id { get; set; }

    public string? FNumber { get; set; }
    public string FNumber { get; set; }//部门编号

    public string? FName { get; set; }

@@ -19,4 +19,7 @@
    public string? FParentID { get; set; }
    public string? FUseOrgId { get; set; }
    public string? FCreateOrgId { get; set; }

    public string? remark4 { get; set; }//折旧科目
    public string? remark5 { get; set; }//科目名称
}

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -80,26 +80,65 @@
        throw new NotImplementedException("删除失败");
    }

    // 插入或更新部门的方法
    private bool InsertOrUpdateDepartment(SqlSugarScope db,
        SysDepartment entity)
    /// <summary>
    /// 同步物料信息new_0/4
    /// </summary>
    /// <param name="db"></param>
    /// <param name="entity"></param>
    /// <returns></returns>
    private bool InsertOrUpdateDepartment(SqlSugarScope db, SysDepartment entity)
    {
        db.Deleteable<SysDepartment>()
            .Where(s => s.Id == entity.Id).ExecuteCommand();
        if (entity.Id == 0)
        {
            // 新增情况：生成新ID并插入
            var newId = GenerateNewId();
            entity.Id = newId;
            entity.Departmentid = newId;
            return db.Insertable(entity).ExecuteCommand() > 0;
        }
        else
        {
            // 更新情况：删除后重新插入，保持原有ID
            var originalId = entity.Id;

        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
            // 先删除原记录（如果存在）
            db.Deleteable<SysDepartment>().Where(s => s.Id == originalId).ExecuteCommand();

            // 重新插入，保持原有ID
            entity.Id = originalId;
            entity.Departmentid = originalId;
            return db.Insertable(entity).ExecuteCommand() > 0;
        }
    }

    // 插入或更新部门的方法
    //private bool InsertOrUpdateDepartment(SqlSugarScope db,SysDepartment entity)
    //{
    //    db.Deleteable<SysDepartment>()
    //        .Where(s => s.Id == entity.Id).ExecuteCommand();

    //    var insert = db.Insertable(entity).ExecuteCommand();
    //    return insert > 0;
    //}

    // 将 ErpDepartment 对象转换为 SysDepartment 对象的方法
    private SysDepartment GetSysDepartment(ErpDepartment department)
    {
        return new SysDepartment
        // 查找是否已存在相同编码的记录。
        var existingCustomer = Db.Queryable<SysDepartment>()
            .Where(s => s.Departmentcode == department.FNumber)
            .First();

        var entity = new SysDepartment
        {
            Departmentcode = department.FNumber,
            // 如果存在，使用现有的ID，后续将删除后重新插入
            // 如果不存在，设为0，InsertOrUpdate方法将生成新ID
            Id = existingCustomer?.Id ?? 0,
            Departmentid = existingCustomer?.Departmentid ?? 0,
            //Id = Convert.ToDecimal(department.Id),
            //Departmentid = Convert.ToDecimal(department.Id),
            Departmentcode = department.FNumber,//主键
            Departmentname = department.FName,
            Departmentid = Convert.ToDecimal(department.Id),
            Id = Convert.ToDecimal(department.Id),
            Depextr1 = department.FDeptProperty,
            Depextr2 = department.FGroup,
            Depextr3 = department.FWIPStockID,
@@ -107,11 +146,50 @@
            FParentID = department.FParentID,
            FSubsidiary = department.FUseOrgId,
            Fumbrella = department.FCreateOrgId,
            CreateDate = DateTime.Now,
            // 如果存在，使用现有的CreateDate，后续将删除后重新插入
            // 如果不存在，设为当前时间
            CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
            //CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",

            Remark4 = department.remark4,
            Remark5 = department.remark5
        };

        // ERP: 0=未禁用, 1=禁用
        // MES: A=未禁用, B=禁用
        if (string.IsNullOrEmpty(department.FForbidStatus))
        {
            entity.Depextr4 = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.Depextr4 = department.FForbidStatus == "1" ? "B" : "A";
        }

        return entity;
    }

    /// <summary>
    /// 生成新的ID，确保不重复
    /// </summary>
    private decimal GenerateNewId()
    {
        // 处理空表的情况，从1开始
        var maxId = Db.Queryable<SysDepartment>().Max(x => (decimal?)x.Id) ?? 0;
        var newId = maxId + 1;

        // 双重检查，确保生成的ID不存在
        while (Db.Queryable<SysDepartment>().Where(x => x.Id == newId).Any())
        {
            newId++;
        }

        return newId;
    }

    // SaveList 方法用于保存多个部门记录，根据类型批量执行不同的操作