物料上传接口修改20240919

BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs

@@ -75,16 +75,9 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
         {
             try
             {
-                SqlSugarDb.Db.Ado.BeginTran();
                 var userId = await _checkServices.GetUserId(App.HttpContext.Request.Headers["key"].ToString());
-                var batchingList = await SqlSugarDb.Db.Queryable<BPA_Batching>().ToListAsync();
-                var typeList = await SqlSugarDb.Db.Queryable<BPA_BatchingType>().ToListAsync();
-                var uintList = await SqlSugarDb.Db.Queryable<BPA_BatchingUint>().ToListAsync();
-                var typeIdList = new List<string>();
-                var uintIdList = new List<string>();
-                var repeatList = new List<ResponseMessageDto>();
-                var successList = new List<ResponseMessageDto>();
-                var defaultUintData = uintList.FirstOrDefault(t => t.Name == "g" || t.Name == "默认单位");
+                var oldUintList = await SqlSugarDb.Db.Queryable<BPA_BatchingUint>().ToListAsync();
+                var defaultUintData = oldUintList.FirstOrDefault(t => t.Name == "g" || t.Name == "默认单位");
                 var defaultUint = new DefaultUintDto();
                 if (defaultUintData != null)
                 {
@@ -103,6 +96,14 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
                     defaultUint.Id = dUint.Id;
                     defaultUint.Name = dUint.Name;
                 }
+                SqlSugarDb.Db.Ado.BeginTran();
+                var batchingList = await SqlSugarDb.Db.Queryable<BPA_Batching>().ToListAsync();
+                var typeList = await SqlSugarDb.Db.Queryable<BPA_BatchingType>().ToListAsync();
+                var uintList = await SqlSugarDb.Db.Queryable<BPA_BatchingUint>().ToListAsync();
+                var typeIdList = new List<string>();
+                var uintIdList = new List<string>();
+                var repeatList = new List<ResponseMessageDto>();
+                var successList = new List<ResponseMessageDto>();
                 var typeAddList = new List<BPA_BatchingType>();
                 var typeUpdateList = new List<BPA_BatchingType>();
                 var uintAddList = new List<BPA_BatchingUint>();