取消OP费用详情中的部分校验

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5464,7 +5464,7 @@ FROM
 
                             #region 是否曾用别名从韩国出入境
                             SetFieldValue(formFields, "applicant_no", selected);   // 否 默认选中
-                            SetFieldValue(formFields, "applicant_yes", "");  
+                            SetFieldValue(formFields, "applicant_yes", "");
 
                             string isGetSchengenStr = custInfo.IsGetSchengen == 0 ? "否" : "是";
                             string oldName = custInfo?.OldName ?? "";
@@ -5519,7 +5519,7 @@ FROM
                                     {
                                         SetFieldValue(formFields, "passport_type__other", selected);
                                         SetFieldValue(formFields, "passport_type__other_remark", "");
-                                    }   
+                                    }
                                     else SetFieldValue(formFields, "passport_ordinary", selected);                                      // 旅行证件类型 - 普通护照
                                 }
 
@@ -5539,7 +5539,7 @@ FROM
                                 SetFieldValue(formFields, "other_passport_type_other", "");      // 旅行证件类型 - 其它
                                 SetFieldValue(formFields, "other_passport_no", "");              // 签证 编号
                                 SetFieldValue(formFields, "other_passport_country", "");         // 签发 国
-                                SetFieldValue(formFields, "other_passport_expiry_date",  "");    // 有效期至
+                                SetFieldValue(formFields, "other_passport_expiry_date", "");    // 有效期至
                                 #endregion
                             }
 
@@ -5607,7 +5607,7 @@ FROM
                                 int children = currFamilyInfos.Where(x => x.Appellation.contains("儿子") || x.Appellation.contains("女儿")).ToList().Count;
 
                                 // 判断子女人数
-                                if (children > 0) 
+                                if (children > 0)
                                 {
                                     SetFieldValue(formFields, "famliy_children_yes", selected);
                                     SetFieldValue(formFields, "famliy_children_number", children.ToString()); // 子女人数
@@ -5631,7 +5631,7 @@ FROM
                                 SetFieldValue(formFields, "education_hight_school_diploma", selected);
                             else
                             {
-                                SetFieldValue(formFields,"education_other", selected);
+                                SetFieldValue(formFields, "education_other", selected);
                                 SetFieldValue(formFields, "education_other_remark", custInfo.HighestEducation.Trim());
                             }
 
@@ -5653,7 +5653,7 @@ FROM
                             SetFieldValue(formFields, "employment_other_remark", "");  // 其他 - 备注
 
                             //职业信息
-                            if (companyInfos!= null && companyInfos.Count > 0)
+                            if (companyInfos != null && companyInfos.Count > 0)
                             {
                                 SetFieldValue(formFields, "employment_name", companyInfos.FirstOrDefault()?.Company ?? ""); // 单位名称
                                 SetFieldValue(formFields, "employment_position", companyInfos.FirstOrDefault()?.Job ?? ""); // 职业
@@ -5695,11 +5695,11 @@ FROM
                                 {
                                     SetFieldValue(formFields, "korea_medical_tourism", selected);  // 医疗旅游
                                 }
-                                else if(visit_purpose.contains("短期商务") || visit_purpose.contains("商务"))
+                                else if (visit_purpose.contains("短期商务") || visit_purpose.contains("商务"))
                                 {
                                     SetFieldValue(formFields, "korea_business", selected);         // 短期商务
                                 }
-                                else if(visit_purpose.contains("学习") || visit_purpose.contains("培训"))
+                                else if (visit_purpose.contains("学习") || visit_purpose.contains("培训"))
                                 {
                                     SetFieldValue(formFields, "korea_study", selected);         // 学习/培训
                                 }
@@ -5833,10 +5833,10 @@ FROM
                                     SetFieldValue(formFields, "invitation_no", "");        // 是否有邀请方 - 否 
                                     SetFieldValue(formFields, "invitation_yes", selected); // 是否有邀请方 - 是
 
-                                    SetFieldValue(formFields,"invitation_name", oa?.Contact?.Trim() ?? "");// 邀请方 姓名
-                                    SetFieldValue(formFields,"invitation_birthday",  "");                  // 邀请方 生日/证件号
-                                    SetFieldValue(formFields,"invitation_relationship", "邀请方");         // 邀请方 关系
-                                    SetFieldValue(formFields,"invitation_address", oa?.Address ?? "");    // 邀请方 地址
+                                    SetFieldValue(formFields, "invitation_name", oa?.Contact?.Trim() ?? "");// 邀请方 姓名
+                                    SetFieldValue(formFields, "invitation_birthday", "");                  // 邀请方 生日/证件号
+                                    SetFieldValue(formFields, "invitation_relationship", "邀请方");         // 邀请方 关系
+                                    SetFieldValue(formFields, "invitation_address", oa?.Address ?? "");    // 邀请方 地址
                                     SetFieldValue(formFields, "invitation_tel", oa?.Tel ?? "");            // 邀请方 电话
                                 }
                             }
@@ -6407,7 +6407,7 @@ FROM
                                 case 3: // 离婚/离异
                                     SetFieldValue(formFields, "civil_divorced", "Yes");
                                     break;
-                                case 4: 
+                                case 4:
 
                                     break;
                             }
@@ -6425,7 +6425,7 @@ FROM
 
 
 
-                            
+
 
                             #region 是否曾用别名从韩国出入境
                             SetFieldValue(formFields, "applicant_no", selected);   // 否 默认选中
@@ -6528,7 +6528,7 @@ FROM
                             #endregion
 
                             #region 5. 婚姻状况及家庭成员信息
-                            
+
 
                             //子女信息
                             SetFieldValue(formFields, "famliy_children_no", selected);  // 否
@@ -21251,12 +21251,12 @@ end as 'country'
                 #endregion
 
                 //验证 
-                (bool valid, string msg) = await GeneralMethod.FeeOpValid(dto.CTGGRId, 79);
-                if (!valid)
-                {
-                    _sqlSugar.RollbackTran();
-                    return Ok(JsonView(false, msg));
-                }
+                // (bool valid, string msg) = await GeneralMethod.FeeOpValid(dto.CTGGRId, 79);
+                // if (!valid)
+                // {
+                //     _sqlSugar.RollbackTran();
+                //     return Ok(JsonView(false, msg));
+                // }
 
                 Result groupData = await _carTouristGuideGroundRep.OpCarTouristGuideGroundContent(dto);
                 if (groupData.Code != 0)

OASystem/OASystem.Infrastructure/Repositories/Resource/MaterialCostRepository.cs

@@ -99,5 +99,15 @@ namespace OASystem.Infrastructure.Repositories.Resource
             })
             .FirstAsync();
         }
+
+        /// <summary>
+        /// 物料成本基础数据初始化
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="NotImplementedException"></exception>
+        public async Task<List<MaterialCostView>> MaterialCostsInSetDataIds()
+        {
+            throw new NotImplementedException();
+        }
     }
 }