1.仓库信息储存逻辑调整 2.生产订单接口优化。

南骏 池

2025-06-06 a4ae3bf5f1826e8e29a95da3dc2c947d713d4ebb

 MES.Service/service/BasicData/MesUnitManager.cs

@@ -23,14 +23,11 @@
                    if (UpdateUnitStatus(db, entity.Id, "B"))
                        return 1;
                    break;
                case "2":
                    if (InsertUnit(db, entity))
                        return 1;
                    break;
                case "3":
                    if (DeleteUnit(db, entity.Id))
                        return 1;
                    break;
                case "2":
                case "4":
                    if (InsertOrUpdate(db, entity))
                        return 1;
@@ -63,14 +60,11 @@
                        if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
                            throw new NotImplementedException("禁用失败");
                        break;
                    case "2":
                        if (!InsertUnitBatch(db, unitGroup.Value))
                            throw new NotImplementedException("插入失败");
                        break;
                    case "3":
                        if (!DeleteUnitBatch(db, unitGroup.Value))
                            throw new NotImplementedException("删除失败");
                        break;
                    case "2":
                    case "4":
                        if (!InsertOrUpdateBatch(db, unitGroup.Value))
                            throw new NotImplementedException("同步失败");
@@ -108,7 +102,8 @@

    private bool DeleteUnit(SqlSugarScope db, decimal unitId)
    {
        var deleteById = db.Deleteable<MesUnit>().In(unitId).ExecuteCommand();
        var deleteById = db.Deleteable<MesUnit>()
            .Where(s => s.Id == unitId).ExecuteCommand();
        if (deleteById > 0)
            return true;

@@ -123,7 +118,7 @@
            Fnumber = unit.FNumber,
            Fname = unit.FName,
            Funitgroupid = unit.FUnitGroupId,
            Fconvertdenominator = unit.FConvertDenominator,
            Fconvertdenominator = Convert.ToDouble(unit.ConvertDenominator),
            Fcurrentunitid = unit.FCurrentUnitId,
            Fconvertnumerator = unit.FConvertNumerator,
            Fbaseunit = unit.FBaseUnit,
@@ -134,7 +129,8 @@
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
            Factory = "1000",
            Type = unit.Type
        };
    }

@@ -164,35 +160,21 @@
    private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
    {
        var ids = unitList.Select(it => it.Id).ToArray();
        var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
        var deleteByIds = db.Deleteable<MesUnit>()
            .Where(s => ids.Contains(s.Id)).ExecuteCommand();
        return deleteByIds > 0;
    }

    private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
    {
        var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
        if (exists)
        {
            var update = db.Updateable(entity).ExecuteCommand();
            if (update > 0)
                return true;
        }
        else
        {
            var insert = db.Insertable(entity).ExecuteCommand();
            if (insert > 0)
                return true;
        }

        return false;
        db.Deleteable<MesUnit>()
            .Where(s => s.Id == entity.Id).ExecuteCommand();
        var insert = db.Insertable(entity).ExecuteCommand();
        return insert > 0;
    }

    private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
    {
        foreach (var entity in unitList)
            if (!InsertOrUpdate(db, entity))
                return false;

        return true;
        return unitList.All(entity => InsertOrUpdate(db, entity));
    }
}