2

hao

2025-04-23 3501b604e6c756e59dba68a5ed3064e26cfd749f

2

 StandardInterface/MES.Service/Dto/webApi/ErpCustomer.cs

@@ -32,5 +32,7 @@
    //public string? FDescription { get; set; }

    public string? fremarks { get; set; }
    public string? CustType { get; set; }
    public string? CustGroup { get; set; }

}

 StandardInterface/MES.Service/Dto/webApi/ErpDepots.cs

@@ -37,5 +37,6 @@
    public string? FStockStatusType { get; set; }  //库存状态类型
    public string? FZYC { get; set; }  //直运仓 
    public string? FGYC { get; set; }  //管易仓
    public string? FZMC { get; set; }  //分组名称

}

 StandardInterface/MES.Service/Modes/MesCustomer.cs

@@ -192,4 +192,16 @@
    public string? Remark5 { get; set; }

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


    /// <summary>
    ///     客户类别
    /// </summary>
    [SugarColumn(ColumnName = "CUST_TYPE")]
    public string? CustType { get; set; } 
    /// <summary>
    ///     客户分组
    /// </summary>
    [SugarColumn(ColumnName = "CUST_GROUP")]
    public string? CustGroup { get; set; }
}

 StandardInterface/MES.Service/Modes/MesDepots.cs

@@ -223,4 +223,9 @@
    /// </summary>
    [SugarColumn(ColumnName = "FGYC")]
    public string? FGYC { get; set; }
    /// <summary>
    ///     分组名称
    /// </summary>
    [SugarColumn(ColumnName = "FZMC")]
    public string? FZMC { get; set; }
}

 StandardInterface/MES.Service/Modes/Organize.cs

@@ -9,7 +9,8 @@
{
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "ID")]

    [SugarColumn(IsPrimaryKey = true, ColumnName = "ID")]
    public decimal Id { get; set; }

    /// <summary>

 StandardInterface/MES.Service/service/BasicData/Material/MesDepotsManager.cs

@@ -151,8 +151,10 @@
            CreateDate = DateTime.Now,
            FZYC= depots.FZYC,
            FGYC= depots.FGYC,
            FZMC= depots.FZMC,  
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type=depots.Type,
        };
    }


 StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs

@@ -176,6 +176,8 @@
            ExpPeriod = item.FExpPeriod,
            //ColorName = item.FColor,
            CreateDate = DateTime.Now,
            Type=item.Type,
            //20250412 是否根据工厂不同修改不同编码
            Company = "1000",
            Factory = "1000",
            /// <summary>

 StandardInterface/MES.Service/service/BasicData/Material/MesUnitManager.cs

@@ -139,7 +139,8 @@
            Fforbidstatus = unit.FForbidStatus,
            CreateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
            Factory = "1000" ,
            Type=unit.Type
        };
    }


 StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs

@@ -18,11 +18,11 @@
            switch (unit.Type)
            {
                case "0":
                    if (UpdatePositionStatus(db, entity.Id, "A")) // 启用岗位
                    if (UpdatePositionStatus(db, entity.Id, "A", null, "")) // 启用岗位
                        return 1;
                    break;
                case "1":
                    if (UpdatePositionStatus(db, entity.Id, "B")) // 禁用岗位
                    if (UpdatePositionStatus(db, entity.Id, "B", entity.DisabledDate, entity.DisabledBy)) // 禁用岗位
                        return 1;
                    break;
                //case "2":
@@ -49,10 +49,11 @@

    // 更新岗位状态的方法
    private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId,
        string status)
        string status, DateTime? jytime, string jyr)
    {
        var result = db.Updateable<MesPosition>()
            .SetColumns(s => s.Fforbidstatus == status)
            .SetColumns(s => s.DisabledDate == jytime)
            .Where(s => s.Id == positionId).ExecuteCommand();

        if (result > 0)
@@ -152,7 +153,8 @@
            DisabledDate = position.FForbidDate != null
                ? DateTime.ParseExact(position.FForbidDate,
                    "yyyy-MM-dd HH:mm:ss", null)
                : null
                : null,
            Type=position.Type,
        };
    }


 StandardInterface/MES.Service/service/BasicData/Organization/MesStaffManager.cs

@@ -235,7 +235,8 @@
            FforbidStatus = staff.FForbidStatus,
            CreateOrg = Convert.ToDecimal(staff.FCreateOrgId),
            UseOrg = Convert.ToDecimal(staff.FUseOrgId),
            FGZZZ=staff.FGZZZ
            FGZZZ=staff.FGZZZ,
            Type = staff.Type,
        };

        //删除  2025-01-04  池南骏

 StandardInterface/MES.Service/service/BasicData/Organization/OrganizeManager.cs

 StandardInterface/MES.Service/service/BasicData/Organization/SysDepartmentManager.cs

@@ -147,7 +147,8 @@
            ParentId = Convert.ToDecimal(department.FParentID),
            FDOCUMENTSTATUS = department.FDocumentStatus,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type=department.Type,
        };
    }


 StandardInterface/MES.Service/service/BasicData/Partner/MesCustomerManager.cs

@@ -145,6 +145,9 @@
            CreateDate = DateTime.Now,
            CreateOrg = Convert.ToDecimal(customer.FCreateOrgId),
            UseOrg = Convert.ToDecimal(customer.FUseOrgId),
            CustType =  customer.CustType,
            CustGroup  =  customer.CustGroup,
            Type= customer.Type,
            Company = "1000",
            Factory = "1000"
        };

 StandardInterface/MES.Service/service/BasicData/Partner/MesSupplierManager.cs

@@ -141,6 +141,7 @@
            Remark = supplier.fremarks,
            Remark3 = supplier.FsuppCategory,
            GYS_FZ = supplier.GYSFZ,
            Type = supplier.Type,
            Company = "1000",
            Factory = "1000"
        };

 StandardInterface/MESApplication/Controllers/BasicData/MesCustomerController.cs

@@ -32,6 +32,7 @@
        entity.Method = METHOD;
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.Route =unit.FNumber;
        entity.CreateBy = "PL017";
        try
        {

 StandardInterface/MESApplication/Controllers/BasicData/MesDepotsController.cs

@@ -33,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route=unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/MesItemsController.cs

@@ -57,6 +57,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = unit.FNumber;

        try
        {

 StandardInterface/MESApplication/Controllers/BasicData/MesPositionController.cs

@@ -34,6 +34,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route=unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/MesStaffController.cs

@@ -33,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(staff);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = staff.FStaffNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/MesSupplierController.cs

@@ -33,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route=unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/MesUnitController.cs

@@ -33,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/OrganizeController.cs

@@ -34,6 +34,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route = unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();

 StandardInterface/MESApplication/Controllers/BasicData/SysDepartmentController.cs

@@ -33,6 +33,7 @@
        entity.Data = JsonConvert.SerializeObject(unit);
        entity.Status = 1;
        entity.CreateBy = "PL017";
        entity.Route=unit.FNumber;
        try
        {
            dynamic resultInfos = new ExpandoObject();