收款账单 --> 新增单条数据操作接口

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -832,6 +832,20 @@ namespace OASystem.API.Controllers
 
         }
 
+        /// <summary>
+        /// 对外收款账单
+        /// （单条数据）添加 And 更新 
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostReceivablesSingleSave(PostReceivablesSingleSaveDto dto)
+        {
+            return Ok(await _ForForeignReceivablesRep.PostReceivablesSingleSave(dto));
+        }
+
+
         /// <summary>
         /// 对外收款账单 
         /// 审核

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5195,21 +5195,7 @@ FROM
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetEnterExitCostInfobyDiId(EnterExitCostInfobyDiIdDto dto)
         {
-            try
-            {
-                var data = await _enterExitCostRep.GetEnterExitCostInfoByDiId(dto);
-
-                if (data.Code != 0)
-                {
-                    return Ok(JsonView(false, data.Msg));
-                }
-
-                return Ok(JsonView(true, "查询成功！", data.Data));
-            }
-            catch (Exception ex)
-            {
-                return Ok(JsonView(false, ex.Message));
-            }
+            return Ok(await _enterExitCostRep.GetEnterExitCostInfoByDiId(dto));
         }
 
         /// <summary>
@@ -5371,7 +5357,7 @@ FROM
                 var dac4 = _DayAndCosts.Where(it => it.Type == 4).ToList(); //培训费
                 var dac5 = _sqlSugar.Queryable<Grp_DayOtherPrice>()
                             .LeftJoin<Sys_SetData>((x, a) => a.IsDel == 0 && a.Id == x.SetDataId)
-                            .LeftJoin<Sys_SetData>((x, a, b) => a.IsDel == 0 && a.Id == x.Currency)
+                            .LeftJoin<Sys_SetData>((x, a, b) => b.IsDel == 0 && b.Id == x.Currency)
                             .Where((x, a, b) => x.IsDel == 0 && x.Diid == dto.DiId)
                             .Select((x, a, b) => new
                             {
@@ -7348,7 +7334,6 @@ FROM
             return Ok(JsonView(false));
         }
 
-
         /// <summary>
         /// 团组模块 - 出入境国家费用标准 List
         /// </summary>
@@ -7389,6 +7374,22 @@ FROM
            
         }
 
+        /// <summary>
+        /// 团组模块 - Info
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostNationalTravelFeeMobileInfo(EnterExitCostInfobyDiIdDto dto)
+        {
+            if (!_portTypeData.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+            if (dto.DiId < 1) return Ok(JsonView(false, MsgTips.DiId));
+
+            var data = await _enterExitCostRep.GetEnterExitCostInfoByDiId(dto);
+
+            return Ok(data);
+
+        }
 
         #endregion
 

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -121,6 +121,9 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<EnterExitCostOperateDto, Grp_EnterExitCost>();
             CreateMap<DayAndCostAddView, Grp_DayAndCost>();
 
+
+            CreateMap<Grp_EnterExitCost, EnterExitCostMobileInfoView>();
+
             #endregion
 
             #region 出入境国家费用标准

OASystem/OASystem.Domain/Dtos/Financial/ForForeignReceivablesNewDto.cs

@@ -42,6 +42,76 @@ namespace OASystem.Domain.Dtos.Financial
         public List<ForeignReceivablesInfoNew>? foreignReceivablesInfos { get; set; }
     }
 
+    /// <summary>
+    /// 对外收款账单
+    /// （单条数据）添加 And 更新  Dto
+    /// </summary>
+    public class PostReceivablesSingleSaveDto : PortDtoBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 主键编号
+        /// id=0 时添加
+        /// 其他值时 修改
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string? PriceName { get; set; }
+
+        /// <summary>
+        /// 费用
+        /// </summary>
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public int Count { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string? Unit { get; set; }
+
+        /// <summary>
+        /// 单项总和
+        /// </summary>
+        public decimal ItemSumPrice { get; set; }
+
+        /// <summary>
+        /// 汇率
+        /// </summary>
+        public decimal Rate { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public int Currency { get; set; }
+
+        /// <summary>
+        /// 添加方式   
+        /// 0 - 账单模块 1 - 成本预算模块 2 - 实际报价 3 - 超支费用
+        /// </summary>
+        public int AddingWay { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; }
+    }
+
+
     /// <summary>
     /// 财务模块
     /// Add or Update Info

OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -446,5 +446,10 @@ namespace OASystem.Domain.Dtos.Groups
 
     }
 
+    public class PostNationalTravelFeeMobileInfoDto : PortDtoBase
+    {
+        public int DiId { get; set; }
+    }
+
     #endregion
 }

OASystem/OASystem.Domain/Result.cs

@@ -54,6 +54,11 @@ namespace OASystem.Domain
         /// </summary>
         public static string Port = "请检查端口值是否正确!“portType”：1:WEB;2:ANDROID;3:IOS;";
 
+        /// <summary>
+        /// 端口错误消息提示-Mobile
+        /// </summary>
+        public static string MobilePort = "请检查端口值是否正确!“portType”：2:ANDROID;3:IOS;";
+
         /// <summary>
         ///  PageIndex 错误消息提示
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Groups/EnterExitCostView.cs

@@ -341,7 +341,6 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public decimal CityTranffic { get; set; }
 
-
         #region 汇率币种
 
         /// <summary>
@@ -448,6 +447,305 @@ namespace OASystem.Domain.ViewModels.Groups
         #endregion
     }
 
+    #region 移动端
+
+    #region info View
+    public class EnterExitCostMobileInfoView
+    {
+        public int Id { get; set; }
+
+        public int DiId { get; set; }
+
+        #region 汇率币种
+
+        /// <summary>
+        ///  多个币种存储
+        ///  存储方式： 美元(USD):6.2350|.......|墨西哥比索(MXN):1.0000
+        /// </summary>
+        public List<CurrencyInfo>? Currencys { get; set; }
+
+        #endregion
+
+        #region 1：境内费用(其他费用)
+        /// <summary>
+        ///  境内费用(其他费用)选择框
+        /// </summary>
+        public int ChoiceOne { get; set; }
+
+        /// <summary>
+        /// 境内费用(其他费用) 合计
+        /// </summary>
+        public decimal ChoiceOneTotalCost { get; set; }
+
+        /// <summary>
+        /// 境内费用(其他费用) 详情
+        /// </summary>
+        public ChoiceOneMobileInfoView ChoiceOneDetails { get; set; }
+        #endregion
+
+        #region 2：国际旅费
+        /// <summary>
+        ///  国际旅费合计选择框
+        /// </summary>
+        public int ChoiceTwo { get; set; }
+
+        /// <summary>
+        /// 国际旅费合计（经济舱）
+        /// </summary>
+        public decimal OutsideJJPay { get; set; }
+
+        /// <summary>
+        ///  国际旅费合计（公务舱）
+        /// </summary>
+        public decimal OutsideGWPay { get; set; }
+
+        /// <summary>
+        /// 国际旅费合计（头等舱）
+        /// </summary>
+        public decimal OutsideTDPay { get; set; }
+
+        /// <summary>
+        /// 国际旅费 详情
+        /// </summary>
+        public ChoiceTwoMobileInfoView ChoiceTwoDetails { get; set; }
+        #endregion
+
+        #region 3：住宿费
+        /// <summary>
+        /// 住宿费合计 选择框
+        /// </summary>
+        public int ChoiceThree { get; set; }
+
+        /// <summary>
+        /// 住宿费合计
+        /// </summary>
+        public decimal ChoiceThreeTotalCost { get { return ChoiceThreeDetails.Sum(x => x.SubTotal); } }
+
+        /// <summary>
+        /// 住宿费子项 Data
+        /// </summary>
+        public DayAndCostMobileInfoView[]? ChoiceThreeDetails { get; set; }
+
+        #endregion
+
+        #region 4：伙食费
+        /// <summary>
+        ///  伙食费合计 选择框
+        /// </summary>
+        public int ChoiceFour { get; set; }
+
+        /// <summary>
+        /// 伙食费合计
+        /// </summary>
+        public decimal ChoiceFourTotalCost { get { return ChoiceFourDetails.Sum(x => x.SubTotal); } }
+
+        /// <summary>
+        /// 伙食费子项Data
+        /// </summary>
+        public DayAndCostMobileInfoView[]? ChoiceFourDetails { get; set; }
+
+        #endregion
+
+        #region 5：公杂费
+        /// <summary>
+        ///  公杂费合计 选择框
+        /// </summary>
+        public int ChoiceFive { get; set; }
+
+        /// <summary>
+        /// 公杂费合计
+        /// </summary>
+        public decimal ChoiceFiveTotalCost { get { return ChoiceFiveDetails.Sum(x => x.SubTotal); } }
+
+        /// <summary>
+        /// 公杂费子项Data
+        /// </summary>
+        public DayAndCostMobileInfoView[]? ChoiceFiveDetails { get; set; }
+
+        #endregion
+
+        #region 6：培训费
+
+        /// <summary>
+        ///  培训费用选择框
+        /// </summary>
+        public int ChoiceSix { get; set; }
+
+        /// <summary>
+        /// 公杂费合计
+        /// </summary>
+        public decimal ChoiceSixTotalCost { get { return ChoiceSixDetails.Sum(x => x.SubTotal); } }
+
+        /// <summary>
+        /// 培训费子项Data
+        /// </summary>
+        public DayAndCostMobileInfoView[]? ChoiceSixDetails { get; set; }
+        #endregion
+
+        #region 7：其他
+        /// <summary>
+        /// 其他款项 选择框
+        /// </summary>
+        public int OtherExpenses_Checked { get; set; }
+
+        /// <summary>
+        /// 其他款项 选择框
+        /// </summary>
+        public decimal OtherExpensesTotalCost { get { return OtherExpensesDetails.Sum(x => x.SubTotal); } }
+
+        /// <summary>
+        /// 其他款项子项Data
+        /// </summary>
+        public DayOtherPriceMobileInfoView[] OtherExpensesDetails { get; set; }
+        #endregion
+
+        /// <summary>
+        /// 经济舱费用总计
+        /// </summary>
+        public decimal TouristClassTotalCost
+        {
+            get
+            {
+                return OutsideJJPay <= 0 ? 0.00M : OutsideJJPay + ChoiceOneTotalCost + ChoiceThreeTotalCost + ChoiceFourTotalCost + ChoiceFiveTotalCost + ChoiceSixTotalCost + OtherExpensesTotalCost;
+            }
+        }
+
+        /// <summary>
+        /// 公务舱费用总计
+        /// </summary>
+        public decimal BusinessClassTotalCost
+        {
+            get
+            {
+                return OutsideGWPay <= 0 ? 0.00M : OutsideGWPay + ChoiceOneTotalCost + ChoiceThreeTotalCost + ChoiceFourTotalCost + ChoiceFiveTotalCost + ChoiceSixTotalCost + OtherExpensesTotalCost;
+            }
+        }
+
+        /// <summary>
+        /// 头等舱费用总计
+        /// </summary>
+        public decimal FirstClassTotalCost
+        {
+            get
+            {
+                return OutsideTDPay <= 0 ? 0.00M : OutsideTDPay + ChoiceOneTotalCost + ChoiceThreeTotalCost + ChoiceFourTotalCost + ChoiceFiveTotalCost + ChoiceSixTotalCost + OtherExpensesTotalCost;
+            }
+        }
+    }
+
+    public class ChoiceOneMobileInfoView
+    {
+        /// <summary>
+        /// 签证费
+        /// </summary>
+        public decimal Visa { get; set; }
+
+        /// <summary>
+        /// 签证费描述
+        /// </summary>
+        public string? VisaRemark { get; set; }
+
+        /// <summary>
+        /// 疫苗费
+        /// </summary>
+        public decimal YiMiao { get; set; }
+
+        /// <summary>
+        /// 核酸检测费用
+        /// </summary>
+        public decimal HeSuan { get; set; }
+
+        /// <summary>
+        /// 服务费用
+        /// </summary>
+        public decimal Service { get; set; }
+
+        /// <summary>
+        /// 参展门票
+        /// </summary>
+        public decimal Ticket { get; set; }
+
+        /// <summary>
+        /// 保险费
+        /// </summary>
+        public decimal Safe { get; set; }
+    }
+
+    public class ChoiceTwoMobileInfoView
+    {
+        /// <summary>
+        ///  国际机票（经济舱）
+        /// </summary>
+        public decimal AirJJ { get; set; }
+
+        /// <summary>
+        ///  国际机票（公务舱）
+        /// </summary>
+        public decimal AirGW { get; set; }
+
+        /// <summary>
+        ///  国际机票（头等舱）
+        /// </summary>
+        public decimal AirTD { get; set; }
+
+        /// <summary>
+        ///  国外城市间交通费
+        /// </summary>
+        public decimal CityTranffic { get; set; }
+    }
+
+    public class DayAndCostMobileInfoView
+    {
+        public int Id { get; set; }
+
+        public int DiId { get; set; }
+
+        public int Type { get; set; }
+
+        public int Days { get; set; }
+
+        public int NationalTravelFeeId { get; set; }
+
+        public string Arae { get; set; }
+
+        public decimal Cost { get; set; }
+
+        public int Currency { get; set; }
+
+        public string CurrencyName { get; set; }
+
+        public decimal SubTotal { get; set; }
+    }
+
+    public class DayOtherPriceMobileInfoView
+    {
+        public int Id { get; set; }
+
+        public int DiId { get; set; }
+
+        public int Index { get; set; }
+
+        public int SetDataId { get; set; }
+
+        public string SetDataName { get; set; }
+
+        public decimal Cost { get; set; }
+
+        public int Currency { get; set; }
+
+        public string CurrencyName { get; set; }
+
+        public decimal SubTotal { get; set; }
+        public string Remark { get; set; }
+    }
+
+    #endregion
+
+    #endregion
+
+
+
+
     /// <summary>
     /// 出入境国家(城市)费用标准子项Info  View
     /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -506,6 +506,91 @@ Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
             return result;
         }
 
+
+        /// <summary>
+        /// 财务模块
+        /// 收款账单(单条) Add And Update
+        /// </summary>
+        /// <param name="diid"></param>
+        /// <returns></returns>
+        public async Task<JsonView> PostReceivablesSingleSave(PostReceivablesSingleSaveDto dto)
+        {
+            JsonView result = new() { Code = 400 };
+
+            if (dto.PortType == 2 || dto.PortType == 3)
+            {
+                result.Msg = MsgTips.MobilePort;
+                return result;
+            }
+
+            if (dto.DiId < 1)
+            {
+                result.Msg = MsgTips.DiId;
+                return result;
+            }
+
+            var selectInfos = await _sqlSugar.Queryable<Fin_ForeignReceivables>().Where(it => it.Diid == dto.DiId && it.Status == 1 && it.Id == dto.Id).FirstAsync();
+            string auditTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+            int status = 0, auditor = 0;
+            if (selectInfos != null)
+            {
+                if (selectInfos.ItemSumPrice == dto.ItemSumPrice)
+                {
+                    status = selectInfos.Status;
+                    auditor = selectInfos.Auditor;
+                    auditTime = selectInfos.AuditTime;
+                }
+            }
+
+            var info = new Fin_ForeignReceivables()
+            {
+                Diid = dto.DiId,
+                Id = dto.Id,
+                PriceName = dto.PriceName,
+                Price = dto.Price,
+                Count = dto.Count,
+                Unit = dto.Unit,
+                ItemSumPrice = dto.ItemSumPrice,
+                Rate = dto.Rate,
+                Currency = dto.Currency,
+                AddingWay = dto.AddingWay,
+                CreateUserId = dto.UserId,
+                CreateTime = DateTime.Now,
+                Remark = dto.Remark,
+                Auditor = auditor,
+                Status = status,
+                AuditTime = auditTime,
+            };
+
+            if (dto.Id < 1) //添加
+            {
+
+                var add = await _sqlSugar.Insertable(info).ExecuteCommandAsync();
+
+                if (add > 0)
+                {
+                    result.Code = 200;
+                    result.Msg = "操作成功";
+                }
+                else result.Msg = "操作失败";
+
+            }
+            else if (dto.Id > 1) //更新
+            {
+                var update = await _sqlSugar.Updateable(info).IgnoreColumns(it => new { it.CreateUserId, it.CreateTime }).ExecuteCommandAsync();
+                if (update > 0)
+                {
+                    result.Code = 200;
+                    result.Msg = "操作成功";
+                }
+                else result.Msg = "操作失败";
+            }
+            else result.Msg = MsgTips.Id;
+
+            return result;
+        }
+
         /// <summary>
         /// 财务模块
         /// 收款账单 

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

@@ -1,7 +1,9 @@
 
 using AutoMapper;
+using NPOI.SS.Formula.Functions;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Groups;
+using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.System;
@@ -67,9 +69,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// 查询 根据 Diid 查询
         /// </summary>
         /// <returns></returns>
-        public async Task<Result> GetEnterExitCostInfoByDiId(EnterExitCostInfobyDiIdDto dto)
+        public async Task<JsonView> GetEnterExitCostInfoByDiId(EnterExitCostInfobyDiIdDto dto)
         {
-            Result result = new Result();
+            var result = new JsonView() { Code = 400 , Msg = "暂无数据" };
 
             var enterExitCostData = await _sqlSugar.Queryable<Grp_EnterExitCost>().FirstAsync(it => it.DiId == dto.DiId && it.IsDel == 0);
 
@@ -97,7 +99,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                     enterExitCostInfoView.DayOtherPriceData = _sqlSugar.Queryable<Grp_DayOtherPrice>()
                                                                 .Where(x => x.IsDel == 0 && x.Diid == dto.DiId)
-                                                                .OrderBy(x=>x.Index)
+                                                                .OrderBy(x => x.Index)
                                                                 .Select(x => new DayOtherPriceView
                                                                 {
                                                                     DiId = x.Diid,
@@ -113,8 +115,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                     enterExitCostInfoView.Currencys = (List<CurrencyInfo>?)CommonFun.GetCurrencyChinaToList(enterExitCostData.CurrencyRemark);
 
-                    result.Msg = "查询成功";
-                    result.Code = 0;
+                    result.Msg = "操作成功";
+                    result.Code = 200;
                 }
                 else
                 {
@@ -139,9 +141,83 @@ namespace OASystem.Infrastructure.Repositories.Groups
 
                 result.Data = enterExitCostInfoView;
             }
-            else result.Msg = MsgTips.Port;
+            else if (dto.PortType == 2 || dto.PortType == 3)
+            {
+                var mobileInfo = new EnterExitCostMobileInfoView();
+                if (enterExitCostData != null)
+                {
+                    mobileInfo = _mapper.Map<EnterExitCostMobileInfoView>(enterExitCostData);
 
+                    var dayAndCostData = _sqlSugar.Queryable<Grp_DayAndCost>()
+                        .LeftJoin<Grp_NationalTravelFee>((dac,ntf) => dac.NationalTravelFeeId == ntf.Id)
+                        .LeftJoin<Sys_SetData>((dac, ntf, sd) => dac.Currency == sd.Id)
+                        .Where((dac, ntf, sd) => dac.IsDel == 0 && dac.DiId == dto.DiId)
+                        .Select((dac, ntf, sd) => new DayAndCostMobileInfoView
+                        {
+                            Id = dac.Id,
+                            DiId = dac.DiId,
+                            Type = dac.Type,
+                            Days = dac.Days,
+                            NationalTravelFeeId = dac.NationalTravelFeeId,
+                            Arae =  $"{ntf.Country}-{ntf.City}",
+                            Cost = dac.Cost,
+                            Currency = dac.Currency,
+                            CurrencyName = sd.Name,
+                            SubTotal = dac.SubTotal,
+                        })
+                        .ToList();
+
+                    mobileInfo.ChoiceOneTotalCost = enterExitCostData.InsidePay;
+                    mobileInfo.ChoiceOneDetails = new ChoiceOneMobileInfoView() { 
+                        Visa = enterExitCostData.Visa,
+                        VisaRemark = enterExitCostData.VisaRemark,
+                        YiMiao = enterExitCostData.YiMiao,
+                        HeSuan = enterExitCostData.HeSuan,
+                        Service = enterExitCostData.Service,
+                        Ticket = enterExitCostData.Ticket,
+                        Safe = enterExitCostData.Safe,
+                    };
+                    mobileInfo.ChoiceTwoDetails = new ChoiceTwoMobileInfoView() 
+                    {   
+                        AirJJ = enterExitCostData.AirJJ, 
+                        AirGW = enterExitCostData.AirGW, 
+                        AirTD = enterExitCostData.AirTD,
+                        CityTranffic = enterExitCostData.CityTranffic
+                    };
+                    mobileInfo.ChoiceThreeDetails = dayAndCostData.Where(it => it.Type == 1).OrderBy(it => it.Days).ToArray(); //住宿费 1
+                    mobileInfo.ChoiceFourDetails = dayAndCostData.Where(it => it.Type == 2).OrderBy(it => it.Days).ToArray();  //伙食费 2
+                    mobileInfo.ChoiceFiveDetails = dayAndCostData.Where(it => it.Type == 3).OrderBy(it => it.Days).ToArray();  //公杂费 3
+                    mobileInfo.ChoiceSixDetails = dayAndCostData.Where(it => it.Type == 4).OrderBy(it => it.Days).ToArray();   //培训费 4
+                    
+                    //其他款项
+                    mobileInfo.OtherExpensesDetails = _sqlSugar.Queryable<Grp_DayOtherPrice>()
+                        .LeftJoin<Sys_SetData>((dop,sd1) => dop.SetDataId == sd1.Id)
+                        .LeftJoin<Sys_SetData>((dop, sd1,sd2) => dop.Currency == sd2.Id)
+                        .Where((dop, sd1, sd2) => dop.IsDel == 0 && dop.Diid == dto.DiId)
+                        .OrderBy((dop, sd1, sd2) => dop.Index)
+                        .Select((dop, sd1, sd2) => new DayOtherPriceMobileInfoView
+                        {
+                            Id = dop.Id,
+                            DiId = dop.Diid,
+                            Index = dop.Index,
+                            SetDataId = dop.SetDataId,
+                            SetDataName = sd1.Name,
+                            Cost = dop.Cost,
+                            Currency = dop.Currency,
+                            CurrencyName = sd2.Remark,
+                            SubTotal = dop.SubTotal,
+                            Remark = dop.Remark,
+                        })
+                        .ToArray();
+
+                    mobileInfo.Currencys = (List<CurrencyInfo>?)CommonFun.GetCurrencyChinaToList(enterExitCostData.CurrencyRemark);
 
+                    result.Msg = "查询成功";
+                    result.Code = 200;
+                }
+                result.Data = mobileInfo;
+            }
+            else result.Msg = MsgTips.Port;
 
             return result;
         }
@@ -443,5 +519,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
+
+
+
     }
 }