新增组合单号、单别字段

kyy

13 分钟以前 14edb885b93e765cba2acfab1f5b51400c810ba7

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -4,7 +4,9 @@
using SqlSugar;

namespace MES.Service.service.BasicData;

/// <summary>
/// 部门信息
/// </summary>
public class SysDepartmentManager : Repository<SysDepartment>
{
    // 当前类已经继承了 Repository 增、删、查、改的方法
@@ -51,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;
@@ -73,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;

@@ -126,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,
@@ -144,35 +147,51 @@
            Depextr3 = department.FWIPStockID,
            Depextr4 = department.FForbidStatus,
            FParentID = department.FParentID,
            FSubsidiary = department.FUseOrgId,
            Fumbrella = department.FCreateOrgId,
            //FSubsidiary = department.FUseOrgId,
            //Fumbrella = department.FCreateOrgId,
            // 如果存在，使用现有的CreateDate，后续将删除后重新插入
            // 如果不存在，设为当前时间
            CreateDate = existingCustomer?.CreateDate ?? DateTime.Now,
            //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,


            FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId) ? "1" : department.FUseOrgId,
            Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId) ? "1" : department.FCreateOrgId,
        };

        // 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;