仓库编码、仓库名称的字段统一

快乐的昕的电脑

2025-12-02 730780020e8f9e9641914d843194e54dfb3a0ba7

仓库编码、仓库名称的字段统一

 MES.Service/Dto/webApi/ErpDepartment.cs

@@ -23,7 +23,8 @@
    public string? remark4 { get; set; }//折旧科目
    public string? remark5 { get; set; }//科目名称

    public string  FNumber_WORKSHOP { get; set; }//工作中心编号
    public string? FNumber_WORKSHOP { get; set; }//工作中心编号
    public string? FName_WORKSHOP { get; set; }//工作中心名称
    public string? factory_name { get; set; }//工厂名称
    public string? Factory { get; set; }//工厂名称
}

 MES.Service/Dto/webApi/ErpDepots.cs

@@ -19,7 +19,7 @@
    public string? Phone { get; set; }

    public string? Factory { get; set; }
    public string? remark3 { get; set; }
    public string? factory_name { get; set; }
    public string? remark4 { get; set; }
    public string? remark5 { get; set; }
}

 MES.Service/Modes/MesDepots.cs

@@ -68,7 +68,7 @@
    public string? Depottype { get; set; }

    /// <summary>
    ///     分厂编码
    ///     工厂编号
    /// </summary>
    [SugarColumn(ColumnName = "factory")]
    public string? Factory { get; set; }
@@ -157,19 +157,19 @@
    public string? MaterialProperti { get; set; }

    /// <summary>
    ///     自定义字段3
    ///     自定义字段3,工厂名称
    /// </summary>
    [SugarColumn(ColumnName = "remark3")]
    public string? Remark3 { get; set; }
    [SugarColumn(ColumnName = "factory_name")]
    public string? factory_name { get; set; }

    /// <summary>
    ///     自定义字段4
    ///     自定义字段4,纳入可用量
    /// </summary>
    [SugarColumn(ColumnName = "remark4")]
    public string? Remark4 { get; set; }

    /// <summary>
    ///     自定义字段5
    ///     自定义字段5,仓库属性
    /// </summary>
    [SugarColumn(ColumnName = "remark5")]
    public string? Remark5 { get; set; }

 MES.Service/Modes/SysDepartment.cs

@@ -86,7 +86,7 @@
    public string? Fmanager { get; set; }

    /// <summary>
    ///     工厂
    ///     工厂编号
    /// </summary>
    [SugarColumn(ColumnName = "factory")]
    public string? Factory { get; set; }

 MES.Service/service/BasicData/MesDepotsManager.cs

@@ -168,22 +168,24 @@
            Department = depots.Fdeptid,
            Phone = depots.Phone,
            Company = "1000",
            Factory = depots.Factory??"1000",
            Remark3 = depots.remark3,
            Factory = depots.Factory,
            factory_name = depots.factory_name,
            Remark4 = depots.remark4,
            Remark5 = depots.remark5,
        };
        // ERP: 0=未禁用, 1=禁用
        // MES: A=未禁用, B=禁用
        //传入0、1或者A、B时都会转为A、B，其他情况为A
        if (string.IsNullOrEmpty(depots.FForbidStatus))
        {
            entity.IsNg = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.IsNg = depots.FForbidStatus == "1" ? "B" : "A";
            // 回传B或1时写入B，其它写A
            entity.IsNg = (depots.FForbidStatus == "1" || depots.FForbidStatus == "B")
                ? "B"
                : "A";
        }

        return entity;

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -152,27 +152,40 @@
            //CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000",

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

            WorkshopCenterCode = department.FNumber_WORKSHOP,
            WorkshopCenterName = department.FName_WORKSHOP,
            FactoryName = department.factory_name

            //不存在（为空或 null），则使用 existingCustomer 的原值，否则用新值。
            WorkshopCenterCode = string.IsNullOrEmpty(department.FNumber_WORKSHOP)
    ? existingCustomer?.WorkshopCenterCode
    : department.FNumber_WORKSHOP,
            WorkshopCenterName = string.IsNullOrEmpty(department.FName_WORKSHOP)
    ? existingCustomer?.WorkshopCenterName
    : department.FName_WORKSHOP,
            FactoryName = string.IsNullOrEmpty(department.factory_name)
    ? existingCustomer?.FactoryName
    : department.factory_name,
            Factory = string.IsNullOrEmpty(department.Factory)
    ? existingCustomer?.Factory
    : department.Factory,

        };

        // ERP: 0=未禁用, 1=禁用
        // MES: A=未禁用, B=禁用
        //传入0、1或者A、B时都会转为A、B，其他情况为A
        if (string.IsNullOrEmpty(department.FForbidStatus))
        {
            entity.Depextr4 = "A";
        }
        else
        {
            //我期望的值是A=否,B=是
            //实际给我的值是0或1，我希望为我转换从A和B的方式
            entity.Depextr4 = department.FForbidStatus == "1" ? "B" : "A";
            // 回传B或1时写入B，其它写A
            entity.Depextr4 = (department.FForbidStatus == "1" || department.FForbidStatus == "B")
                ? "B"
                : "A";
        }

        return entity;