1

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -12772,13 +12772,7 @@ ORDER by  gctggrc.id DESC
 
             #endregion
 
-            var viewData = await _tourClientListRep._BasicDataInit(_dto.PortType);
-            if (viewData.Code != 0)
-            {
-                return Ok(JsonView(false, viewData.Msg));
-            }
-
-            return Ok(JsonView(viewData.Data));
+            return Ok(await _tourClientListRep._BasicDataInit(_dto.PortType));
         }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -179,12 +179,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     {
                         //修改验证
                         //IsConfirm == 2 不可修改
-                        var info = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.Id == enterExitCost.Id).First();
-                        if (info.IsConfirm == 2)
-                        {
-                            result.Msg = "该团出入境费用已确认!不可更改!!";
-                            return result;
-                        }
+                        //var info = _sqlSugar.Queryable<Grp_EnterExitCost>().Where(it => it.IsDel == 0 && it.Id == enterExitCost.Id).First();
+                        //if (info.IsConfirm == 2)
+                        //{
+                        //    result.Msg = "该团出入境费用已确认!不可更改!!";
+                        //    return result;
+                        //}
 
                         var updateId = _sqlSugar.Updateable<Grp_EnterExitCost>(enterExitCost)
                                                 .IgnoreColumns(it => new { it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })

OASystem/OASystem.Infrastructure/Repositories/Groups/TourClientListRepository.cs

@@ -122,15 +122,16 @@ WHERE
         /// </summary>
         /// <param name="portId"></param>
         /// <returns></returns>
-        public async Task<Result> _BasicDataInit(int portId)
+        public async Task<JsonView> _BasicDataInit(int portId)
         {
+            var view = new JsonView() { Code = StatusCodes.Status400BadRequest, Msg = "操作失败!" };
             if (portId == 1 || portId == 2 || portId == 3) // 1 web 2 Android 3 ios
             {
                 
                 var setData = await _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0) .ToListAsync();
 
                 var shippingSpaceTypeData = setData.Where(it => it.STid == 44).ToList(); //舱位类型
-                List<SetDataInfoView> _ShippingSpaceTypeData = _mapper.Map<List<SetDataInfoView>>(shippingSpaceTypeData);
+                var shippingSpaceTypeData1 = _mapper.Map<List<SetDataInfoView>>(shippingSpaceTypeData);
 
                 //var passportTypeData = setData.Where(it => it.STid == 74).ToList(); //护照类型
                 //List<SetDataInfoView> _PassportTypeData = _mapper.Map<List<SetDataInfoView>>(passportTypeData);
@@ -142,27 +143,27 @@ WHERE
 	                                                Left Join Crm_CustomerCompany ccom On dc.CrmCompanyId = ccom.Id  And ccom.IsDel = 0
 	                                                Left Join Crm_CustomerCert cc1 On dc.Id = cc1.DcId And cc1.SdId = 773 And cc1.IsDel = 0
 	                                                Where dc.IsDel = 0");
-                var clientData = await _sqlSugar.SqlQueryable<TourClientListDetailsView>(clientInfoSql).ToListAsync();
+                var clientData = _sqlSugar.SqlQueryable<TourClientListDetailsView>(clientInfoSql).ToList();
 
                 //公司信息 
                 var clientCompanySql = string.Format(@"Select Id,CompanyFullName From Crm_CustomerCompany Where IsDel = 0");
-                var clientCompanyData = await _sqlSugar.SqlQueryable<CustomerCompanyCiew>(clientCompanySql).ToListAsync();
+                var clientCompanyData =  _sqlSugar.SqlQueryable<CustomerCompanyCiew>(clientCompanySql).ToList();
                 clientCompanyData = clientCompanyData.DistinctBy(it => it.CompanyFullName).ToList();
 
                 var _view = new {
-                    ShippingSpaceTypeData = _ShippingSpaceTypeData,
+                    ShippingSpaceTypeData = shippingSpaceTypeData1,
                     ClientData = clientData,
                     ClientCompanyData = clientCompanyData
                     //PassportTypeData = _PassportTypeData
                 };
-                _result.Code = 0;
-                _result.Data = _view;
+                view.Code = StatusCodes.Status200OK;
+                view.Data = _view;
             }
             else
             {
-                _result.Msg = "请传入有效的PortType参数,1 Web 2 Android 3 IOS!";
+                view.Msg = "请传入有效的PortType参数,1 Web 2 Android 3 IOS!";
             }
-            return _result;
+            return view;
         }
 
         /// <summary>

OASystem/OASystem.Infrastructure/Repositories/PersonnelModule/GoodsRepository.cs

@@ -1,11 +1,9 @@
 using AutoMapper;
-using EyeSoft.IO;
+using Newtonsoft.Json;
 using OASystem.Domain.Dtos.PersonnelModule;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.PersonnelModule;
 using OASystem.Domain.ViewModels.PersonnelModule;
-using System.Drawing;
-using Newtonsoft.Json;
 
 namespace OASystem.Infrastructure.Repositories.PersonnelModule
 {
@@ -594,7 +592,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                     if (subData1.Count > 0)
                     {
                         var storageIds = subData1.Select(x => x.StorageId).ToList();
-                        var storages = await _sqlSugar.Queryable<Pm_GoodsStorage>().Where(x => x.IsDel == 0 && storageIds.Contains(x.Id)) .ToListAsync();
+                        var storages = await _sqlSugar.Queryable<Pm_GoodsStorage>().Where(x => x.IsDel == 0 && storageIds.Contains(x.Id)).ToListAsync();
                         foreach (var item in subData1)
                         {
                             var storageInfo = storages.Find(x => x.Id == item.StorageId);
@@ -602,6 +600,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                             {
                                 subData.Add(new
                                 {
+                                    StorageId = item.StorageId,
                                     BatchNo = storageInfo.BatchNo,
                                     RecsiveQuantity = item.Quantity
                                 });
@@ -616,6 +615,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
                 }
             }
 
+
             _jv.Code = StatusCodes.Status200OK;
             _jv.Data = data;
             _jv.Msg = $"操作成功";
@@ -766,8 +766,8 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
 
                 //3.入库批次关联领用人 更改批次库存
                 var goodsStorages = await _sqlSugar.Queryable<Pm_GoodsStorage>()
-                                                                    .Where(x => x.IsDel == 0 && 
-                                                                                             x.GoodsId == currInfo.GoodsId && 
+                                                                    .Where(x => x.IsDel == 0 &&
+                                                                                             x.GoodsId == currInfo.GoodsId &&
                                                                                              (x.Quantity - x.ReceiveQuantity) > 0
                                                                      )
                                                                     .OrderBy(x => x.CreateTime)
@@ -837,9 +837,6 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             return _jv;
         }
 
-
-
-
         /// <summary>
         /// 物品领用 Del
         /// </summary>
@@ -858,7 +855,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
             }
 
             var edit = await _sqlSugar.Updateable<Pm_GoodsReceive>()
-                                        .UpdateColumns(x => new Pm_GoodsReceive()
+                                        .SetColumns(x => new Pm_GoodsReceive()
                                         {
                                             IsDel = 1,
                                             DeleteUserId = currUserId,