多组织修改

sjz

2025-07-28 f1deb7b024e17cba204de5fcb0dac15801436b90

 MES.Service/service/WomcaaManager.cs

@@ -40,8 +40,7 @@
                case "5":
                    return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{womErpCaa.Type}这个类型");
                    throw new NotImplementedException( $"type没有{womErpCaa.Type}这个类型");
            }
        }) > 0;
    }
@@ -49,10 +48,14 @@
    private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
        if (mesWomcaa.Id != null)
        {
            base.DeleteById(mesWomcaa.Id);
        }
        if (mesWomcabs.Count > 0)
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
                .ExecuteCommand();
        {
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
        }
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        db.Ado.CommitTran();
@@ -64,18 +67,16 @@
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand(
                "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            var result = int.Parse((string)outParam1.Value);
            var message = outParam2.Value == DBNull.Value
                ? string.Empty
                : (string)outParam2.Value;
            var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            //db.Ado.CommitTran();
            return true;
@@ -84,15 +85,17 @@
        throw new NotImplementedException("插入或更新失败");
    }

    private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
        if (mesWomcaa.Id != null)
        {
            base.DeleteById(mesWomcaa.Id);
        }

        if (mesWomcabs.Count > 0)
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
                .ExecuteCommand();

        {
            db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
        }
        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        db.Ado.CommitTran();
@@ -104,18 +107,16 @@
            var outParam1 = new SugarParameter("c_Result", null, true);
            var outParam2 = new SugarParameter("C_MSG", null, true);
            // 使用 SqlSugar 执行存储过程
            Db.Ado.ExecuteCommand(
                "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
                inputParam1, outParam1, outParam2);
            Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",inputParam1, outParam1, outParam2);
            // 获取输出参数的值
            var result = int.Parse((string)outParam1.Value);
            var message = outParam2.Value == DBNull.Value
                ? string.Empty
                : (string)outParam2.Value;
            var message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
            if (result == 1)
            {
                //存储过程失败则事务进行回滚
                //db.Ado.RollbackTran();
                throw new Exception(message);
            }
            // 提交事务
            //db.Ado.CommitTran();
            return true;
@@ -124,15 +125,16 @@
        throw new NotImplementedException("插入或更新失败");
    }

    private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
        List<Womcab> mesWomcabs)
    private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
    {
        var decimals = mesWomcabs.Select(s => s.Id).ToArray();
        var update = base.DeleteById(mesWomcaa.Id);
        var insertOrUpdate =
            db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
        var insertOrUpdate =db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;

        if (update && insertOrUpdate) return true;
        if (update && insertOrUpdate)
        {
            return true;
        }
        throw new NotImplementedException("更新失败");
    }

@@ -165,7 +167,7 @@
            Caa023 = dto.FStatus,
            Caa024 = 0,
            RoutingId = dto.FRoutingId,
            WorkShopId = dto.FREMWorkShopId,
            WorkShopId = dto.FremWorkShopId,
            DepotCode = dto.FStockId,
            CreateDate = dto.FDate,
            WorkGroupId = dto.FWorkGroupId,
@@ -185,8 +187,8 @@
            SrcSplitBillno = dto.FSrcSplitBillNo,
            F_ZSXG_KH = dto.F_ZSXG_KH,
            F_ZJXF_YHRQ = dto.F_ZJXF_YHRQ,
            PrdOrg = dto.erP_SCZZ,
            TrustOrg = dto.erP_WTZZ,
            PrdOrg = dto.ERP_SCZZ,
            TrustOrg = dto.ERP_WTZZ,
            TbTime = DateTime.Now,
            JaBs = "0",
            SupplierId = dto.SupplierId,
@@ -195,9 +197,13 @@
        };

        if (dto.Type == "5")
        {
            entity.IsXg = 1;
        }
        else
        {
            entity.IsXg = 0;
        }

        if (dto.FStatus == "6" || dto.FStatus == "7")
        {
@@ -206,7 +212,10 @@
        }

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
        if (single != null) entity.Id = single.Id;
        if (single != null)
        {
            entity.Id = single.Id;
        }

        return entity;
    }
@@ -248,9 +257,11 @@
                ProcNo = dto.F_ZJXF_SSGX
            };

            var entity = Db.Queryable<Womcab>()
                .Where(s => s.Erpid == womcab.Erpid).Single();
            if (entity != null) womcab.Id = entity.Id;
            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
            if (entity != null)
            {
                womcab.Id = entity.Id;
            }

            womcabList.Add(womcab);
        }