Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -8708,6 +8708,19 @@ namespace OASystem.API.Controllers
                     designer.SetDataSource("BJPGWCZLR", ((decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs)) - decimal.Parse(leftBindData.cb)) * decimal.Parse(leftBindData.rs));
                 }
 
+                leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("头等舱"));
+                if (leftBindData != null)
+                {
+                    designer.SetDataSource("BJPTDCCB", leftBindData.cb);
+                    designer.SetDataSource("BJPTDCPNum", leftBindData.rs);
+                    designer.SetDataSource("BJPTDCXS", leftBindData.xs);
+                    designer.SetDataSource("BJPTDCZCB", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.rs));
+                    designer.SetDataSource("BJPTDCDRBJ", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs));
+                    designer.SetDataSource("BJPTDCZBJ", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs) * decimal.Parse(leftBindData.rs));
+                    designer.SetDataSource("BJPTDCDRLR", decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs) - decimal.Parse(leftBindData.cb));
+                    designer.SetDataSource("BJPTDCZLR", ((decimal.Parse(leftBindData.cb) * decimal.Parse(leftBindData.xs)) - decimal.Parse(leftBindData.cb)) * decimal.Parse(leftBindData.rs));
+                }
+
                 leftBindData = left.leftinfoNumber.Find(x => x.title.Contains("火车票"));
                 if (leftBindData != null)
                 {
@@ -8945,6 +8958,38 @@ namespace OASystem.API.Controllers
                     TzZBJ2 += decimal.Parse(rightBindData.bj) * decimal.Parse(rightBindData.rs);
                 }
 
+                rightBindData = right.rightInfoNumber.Find(x => x.title.Contains("头等舱 JS/ES"));
+                if (rightBindData != null)
+                {
+                    //头等舱 + 小套房 JSES
+                    designer.SetDataSource("BlblTDCJSESDRCB", rightBindData.cb);
+                    designer.SetDataSource("BtxtTDCJSESRS", rightBindData.rs);
+                    designer.SetDataSource("BlblTDCJSESZCB", decimal.Parse(rightBindData.cb) * decimal.Parse(rightBindData.rs));
+                    designer.SetDataSource("BlblTDCJSESDRBJ", rightBindData.bj);
+                    designer.SetDataSource("BlblTDCJSESZBJ", decimal.Parse(rightBindData.bj) * decimal.Parse(rightBindData.rs));
+                    designer.SetDataSource("BlblTDCJSESDRLR", decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb));
+                    designer.SetDataSource("BlblTDCJSESZLR", (decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb)) * decimal.Parse(rightBindData.rs));
+                    TzZCB2 += decimal.Parse(rightBindData.cb) * decimal.Parse(rightBindData.rs);
+                    TzZLR2 += (decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb)) * decimal.Parse(rightBindData.rs);
+                    TzZBJ2 += decimal.Parse(rightBindData.bj) * decimal.Parse(rightBindData.rs);
+                }
+
+                rightBindData = right.rightInfoNumber.Find(x => x.title.Contains("头等舱 SUITE"));
+                if (rightBindData != null)
+                {
+                    //头等舱 + 大套房
+                    designer.SetDataSource("BlblTDCSUITEDRCB", rightBindData.cb);
+                    designer.SetDataSource("BtxtTDCSUITERS", rightBindData.rs);
+                    designer.SetDataSource("BlblTDCSUITEZCB", decimal.Parse(rightBindData.cb) * decimal.Parse(rightBindData.rs));
+                    designer.SetDataSource("BlblTDCSUITEDRBJ", rightBindData.bj);
+                    designer.SetDataSource("BlblTDCSUITEZBJ", decimal.Parse(rightBindData.bj) * decimal.Parse(rightBindData.rs));
+                    designer.SetDataSource("BlblTDCSUITEDRLR", decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb));
+                    designer.SetDataSource("BlblTDCSUITEZLR", (decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb)) * decimal.Parse(rightBindData.rs));
+                    TzZCB2 += decimal.Parse(rightBindData.cb) * decimal.Parse(rightBindData.rs);
+                    TzZLR2 += (decimal.Parse(rightBindData.bj) - decimal.Parse(rightBindData.cb)) * decimal.Parse(rightBindData.rs);
+                    TzZBJ2 += decimal.Parse(rightBindData.bj) * decimal.Parse(rightBindData.rs);
+                }
+
                 #endregion
 
                 #region 标题

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupCostParameterRepository.cs

@@ -343,6 +343,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     }
 
                     // 报批总报价 - 经济舱
+                    if (eec.SumJJC == 0)
+                    {
+                        AirJJCTotal = 0;
+                    }
                     var SumAirJJC = new
                     {
                         Type = "SumAirJJC",
@@ -351,6 +355,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     dynamics.Add(SumAirJJC);
 
                     //报批总报价 - 公务舱
+                    if (eec.SumGWC == 0)
+                    {
+                        AirGWCTotal = 0;
+                    }
                     var SumAirGWC = new
                     {
                         Type = "SumAirGWC",
@@ -359,6 +367,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     dynamics.Add(SumAirGWC);
 
                     //报批总报价 - 头等舱
+                    if (eec.SumTDC == 0)
+                    {
+                        AirTDCTotal = 0;
+                    }
                     var SumAirTDC = new
                     {
                         Type = "SumAirTDC",