MES.Service/Modes/SysDepartment.cs

@@ -187,5 +187,11 @@
    [SugarColumn(ColumnName = "factory_name")]
    public string? FactoryName { get; set; }

    /// <summary>
    ///     用于区分部门表与工作中心信息
    /// </summary>
    [SugarColumn(ColumnName = "Type_By_Table")]
    public int? TypeByTable { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}

 MES.Service/service/BasicData/MesItemsManager.cs

@@ -311,7 +311,43 @@
        }
        else
        {
            entity.SubconUnit = "0";
            entity.DepotCode = "0";
        }

        //采购员编码转ID,Fpurchaserid = item.FPurchaserId,
        var entityFpurchaserid = Db.Queryable<MesStaff>()
        .Where(x => x.StaffNo == item.FPurchaserId)
        .Select(x => x.Id.ToString())
        .First();
        if (!string.IsNullOrWhiteSpace(entityFpurchaserid))
        {
            entity.Fpurchaserid = entityFpurchaserid;
        }
        else if (!string.IsNullOrWhiteSpace(item.FPurchaserId))
        {
            entity.Fpurchaserid = item.FPurchaserId;
        }
        else
        {
            entity.Fpurchaserid = "0";
        }

        //工作中心编码转ID,ProductionWorkshop = item.FWorkShopId,
        var entityProductionWorkshop = Db.Queryable<SysDepartment>()
        .Where(x => x.WorkshopCenterCode == item.FWorkShopId)
        .Select(x => x.Id.ToString())
        .First();
        if (!string.IsNullOrWhiteSpace(entityProductionWorkshop))
        {
            entity.ProductionWorkshop = entityProductionWorkshop;
        }
        else if (!string.IsNullOrWhiteSpace(item.FWorkShopId))
        {
            entity.ProductionWorkshop = item.FWorkShopId;
        }
        else
        {
            entity.ProductionWorkshop = "0";
        }

        //// ERP: Y=未禁用, N=禁用

 MES.Service/service/BasicData/MesWorkshopcentersManager.cs

@@ -53,7 +53,7 @@
    {
        var result = db.Updateable<SysDepartment>()
            .SetColumns(s => s.Depextr4 == status)
            .Where(s => s.Id == departmentId).ExecuteCommand();
            .Where(s => s.Id == departmentId && s.TypeByTable==1).ExecuteCommand();

        if (result > 0)
            return true;
@@ -75,7 +75,7 @@
    private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
    {
        var deleteById = db.Deleteable<SysDepartment>()
            .Where(s => s.Id == departmentId).ExecuteCommand();
            .Where(s => s.Id == departmentId && s.TypeByTable==1).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -128,18 +128,19 @@
    {
        // 查找是否已存在相同编码的记录。
        var existingCustomer = Db.Queryable<SysDepartment>()
            .Where(s => s.Departmentcode == department.FDept)
            .Where(s => s.WorkshopCenterCode == department.FNumber && s.TypeByTable==1)
            .First();

        var entity = new SysDepartment
        {
            TypeByTable = 1,//用于区分部门表与工作中心信息（0/1）
            // 如果存在，使用现有的ID，后续将删除后重新插入
            // 如果不存在，设为0，InsertOrUpdate方法将生成新ID
            Id = existingCustomer?.Id ?? 0,
            Departmentid = existingCustomer?.Departmentid ?? 0,
            //Id = Convert.ToDecimal(department.Id),
            //Departmentid = Convert.ToDecimal(department.Id),
            Departmentcode = department.FDept,//主键
            Departmentcode = department.FDept,//部门编号
            Depextr4 = department.FForbidStatus,
            // 如果存在，使用现有的CreateDate，后续将删除后重新插入
            // 如果不存在，设为当前时间
@@ -150,7 +151,7 @@
            //不存在（为空或 null），则使用 existingCustomer 的原值，否则用新值。
            WorkshopCenterCode = string.IsNullOrEmpty(department.FNumber)
    ? existingCustomer?.WorkshopCenterCode
    : department.FNumber,
    : department.FNumber,////主键
            WorkshopCenterName = string.IsNullOrEmpty(department.FName)
    ? existingCustomer?.WorkshopCenterName
    : department.FName,

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -53,7 +53,7 @@
    {
        var result = db.Updateable<SysDepartment>()
            .SetColumns(s => s.Depextr4 == status)
            .Where(s => s.Id == departmentId).ExecuteCommand();
            .Where(s => s.Id == departmentId && s.TypeByTable==0).ExecuteCommand();

        if (result > 0)
            return true;
@@ -75,7 +75,7 @@
    private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
    {
        var deleteById = db.Deleteable<SysDepartment>()
            .Where(s => s.Id == departmentId).ExecuteCommand();
            .Where(s => s.Id == departmentId && s.TypeByTable==0).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -128,11 +128,12 @@
    {
        // 查找是否已存在相同编码的记录。
        var existingCustomer = Db.Queryable<SysDepartment>()
            .Where(s => s.Departmentcode == department.FNumber)
            .Where(s => s.Departmentcode == department.FNumber && s.TypeByTable==0)
            .First();

        var entity = new SysDepartment
        {
            TypeByTable=0,//用于区分部门表与工作中心信息（0/1）
            // 如果存在，使用现有的ID，后续将删除后重新插入
            // 如果不存在，设为0，InsertOrUpdate方法将生成新ID
            Id = existingCustomer?.Id ?? 0,