1、新增主副规格要填写物料编码和物料名称

2、床网如果有弹叉，副规格也需要在床垫处补充填写

JLHHJSvr/Com/GetMattressInterfaceList.cs

@@ -21,6 +21,10 @@ namespace JLHHJSvr.Com
         /// 单据id
         /// </summary>
         public int? mattressid { get; set; }
+        /// <summary>
+        /// 单据编码 
+        /// </summary>
+        public int? mattresscode { get; set; }
         public int? isEdit { get; set; }
     }
 

JLHHJSvr/Com/Model/u_mattress.cs

@@ -213,6 +213,10 @@ namespace JLHHJSvr.Com.Model
         /// 4：小单报价-部门含税价
         /// </summary>
         public decimal? dannum_cost4 { get; set; }
+        /// <summary>
+        /// 床网是否使用弹叉
+        /// </summary>
+        public byte? bednet_iffork { get; set; }
         #endregion
     }
 }

JLHHJSvr/Com/Model/u_mattress_mx_mtrl.cs

@@ -71,6 +71,11 @@ namespace JLHHJSvr.Com.Model
         /// 物料表-是否主副规格调整物料
         /// </summary>
         public int? if_subspecs { get; set; }
+        public byte? bednet_iffork { get; set; }
+        /// <summary>
+        /// 床网弹叉数量
+        /// </summary>
+        public decimal? bednet_fork_qty { get; set; }
         #endregion
     }
 }

JLHHJSvr/Com/ReCalculateERPCost.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    public sealed class ReCalculateERPCostRequest : ILJRequest<ReCalculateERPCostResponse>
+    {
+        public override string GetApiName()
+        {
+            return "ReCalculateERPCost";
+        }
+        public string token { get; set; }
+        /// <summary>
+        /// 床垫信息：主表
+        /// </summary>
+        public List<u_mattress> list { get; set; }
+    }
+
+    public sealed class ReCalculateERPCostResponse : LJResponse
+    {
+        public string logMsg { get; set; }
+    }
+}

JLHHJSvr/Excutor/ReCalculateERPCostExcutor.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.Helper;
+using JLHHJSvr.LJException;
+using JLHHJSvr.Tools;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+using NPOI.OpenXml4Net.OPC.Internal;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class ReCalculateERPCostExcutor : ExcutorBase<ReCalculateERPCostRequest, ReCalculateERPCostResponse>
+    {
+        protected override void ExcuteInternal(ReCalculateERPCostRequest request, object state, ReCalculateERPCostResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断，请重新登录";
+                return;
+            }
+            if (request.list == null)
+            {
+                rslt.ErrMsg = "提交缺少列表参数,请检查!";
+                return;
+            }
+            if (!request.list.Any())
+            {
+                rslt.ErrMsg = "至少提交一条需要重算的记录";
+                return;
+            }
+
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                var log_sb = new StringBuilder();
+                var helper = HelperBase.GetHelper<MattressHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
+                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
+
+                foreach (var mattress in request.list)
+                {
+                    DbSqlHelper.SelectOne(cmd, mattress, "flag,deptid");
+
+                    //if (mattress.flag == 1) throw new LJCommonException("存在报价单已审核,不能重算!");
+                    if (mattress.deptid <= 0) throw new LJCommonException("存在报价单部门id错误,不能重算!");
+
+                    var dept = new u_dept() { deptid = mattress.deptid.Value };
+                    DbSqlHelper.SelectOne(cmd, dept, "pricelistid");
+                    if (dept.pricelistid <= 0) throw new LJCommonException("存在报价单部门pricelistid错误,不能重算!");
+                }
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    foreach (var mattress in request.list)
+                    {
+
+                        var mattress_temp = helper.GetMattress(mattress.mattressid);
+                        var mxList = helper.GetMattressMxMtrl(mattress.mattressid);
+                        var mxExtra1List = helper.GetMattressMxExtra(mattress.mattressid, 1);
+                        var mxExtra2List = helper.GetMattressMxExtra(mattress.mattressid, 2);
+                        var subspecsList = helper.GetMattressSubspecs(mattress.mattressid);
+                        try
+                        {
+                            helper.MattressCalculateCost(mattress_temp, mxList, mxExtra1List, mxExtra2List);
+                            helper.SaveMattress(mattress_temp, mxList, mxExtra1List, mxExtra2List);
+
+                            if(mattress_temp.erp_mtrlid > 0)
+                            {
+                                string errmsg = l1Helper.SaveMtrldef(mattress_temp);
+                                if (!string.IsNullOrEmpty(errmsg)) throw new LJCommonException(errmsg);
+                            }
+
+                            cmd.Transaction.Commit();
+                            log_sb.Append($"床垫唯一码:{mattress_temp.mattresscode}重算成功\r\n");
+                        }
+                        catch (Exception ex)
+                        {
+                            cmd.Transaction.Rollback();
+                            log_sb.Append($"床垫唯一码:{mattress_temp.mattresscode}重算失败\r\n");
+                        }
+                    }
+
+                    if(log_sb.Length > 0) rslt.logMsg = log_sb.ToString();
+                }
+            }
+        }
+    }
+}

JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -123,6 +123,8 @@ namespace JLHHJSvr.Excutor
                                 _mattress.mattress_width = Convert.ToInt32(submx["mattress_width"]);
                                 _mattress.mattress_length = Convert.ToInt32(submx["mattress_length"]);
                                 _mattress.mattress_height = Convert.ToInt32(submx["mattress_height"]);
+                                _mattress.mattressrelcode = Convert.ToString(submx["mattressrelcode"]);
+                                _mattress.mattressname = Convert.ToString(submx["mattressname"]);
 
                                 var _mattressMx = new List<u_mattress_mx_mtrl>();
                                 if (request.mattressMx != null && request.mattressMx.Any())
@@ -152,6 +154,7 @@ namespace JLHHJSvr.Excutor
                                             {
                                                 var _spring_qty_width = Convert.ToInt32(submx["spring_qty_width_" + bednetIndex]);
                                                 var _spring_qty_length = Convert.ToInt32(submx["spring_qty_length_" + bednetIndex]);
+                                                var _bednet_fork_qty = Convert.ToInt32(submx["bednet_fork_qty_" + bednetIndex]);
 
                                                 cmd.CommandText = @"SELECT TOP 1 u_bednet.bednetid
                                                                             ,u_bednet_type.typename
@@ -221,10 +224,9 @@ namespace JLHHJSvr.Excutor
                                                 cmd.Parameters.AddWithValue("@felt_qty", _bednet.felt_qty);
                                                 cmd.Parameters.AddWithValue("@felt_x_mtrlid", _bednet.felt_x_mtrlid);
                                                 cmd.Parameters.AddWithValue("@felt_x_qty", _bednet.felt_x_qty);
-                                                cmd.Parameters.AddWithValue("@fork_qty", _bednet.fork_qty);
                                                 cmd.Parameters.AddWithValue("@felt_dscrp", _bednet.felt_dscrp);
                                                 cmd.Parameters.AddWithValue("@duo_qv_str", _bednet.duo_qv_str);
-
+                                                cmd.Parameters.AddWithValue("@fork_qty", _bednet.iffork == 1 ? _bednet_fork_qty : 0);
                                                 cmd.Parameters.AddWithValue("@bednet_height", _bednetMx[0].bednet_height);
                                                 cmd.Parameters.AddWithValue("@springid", _bednetMx[0].springid);
                                                 cmd.Parameters.AddWithValue("@spring_qty_width", _spring_qty_width);
@@ -260,7 +262,7 @@ namespace JLHHJSvr.Excutor
                                                 oBednet = _bednet;
                                                 _bednetMx[0].spring_qty_width = Convert.ToInt32(submx["spring_qty_width_" + bednetIndex]);
                                                 _bednetMx[0].spring_qty_length = Convert.ToInt32(submx["spring_qty_length_" + bednetIndex]);
-
+                                                oBednet.fork_qty = Convert.ToInt32(submx["bednet_fork_qty_" + bednetIndex]);
                                                 oBednet.bednetid = 0;
 
                                                 // 袋装网，多个分区时，重新分配弹簧
@@ -306,7 +308,6 @@ namespace JLHHJSvr.Excutor
                                                 ifSubspecsIndex++;
                                                 item.mtrlid = Convert.ToInt32(submx["cushions_subspecs_" + ifSubspecsIndex]);
                                             }
-
                                         }
                                         #endregion
 

JLHHJSvr/GlobalVar/GlobalVar.cs

@@ -207,6 +207,7 @@ namespace JLHHJSvr
                 excutorManager.AddMap("CopyMattressAudited", typeof(CopyMattressAuditedRequest), new CopyMattressAuditedExcutor());// 复制审核床垫报价
                 excutorManager.AddMap("ReCalculateNoAudit", typeof(ReCalculateNoAuditRequest), new ReCalculateNoAuditExcutor());// 重算床垫报价
                 excutorManager.AddMap("ReCalculateBedNetNoAudit", typeof(ReCalculateBedNetNoAuditRequest), new ReCalculateBedNetNoAuditExcutor());// 重算床网报价
+                excutorManager.AddMap("ReCalculateERPCost", typeof(ReCalculateERPCostRequest), new ReCalculateERPCostExcutor());// 重算床网报价
 
                 excutorManager.AddMap("MattressYWAudit", typeof(MattressYWAuditRequest), new MattressYWAuditExcutor());// 床垫接口业务审核撤审
                 excutorManager.AddMap("MattressJSAudit", typeof(MattressJSAuditRequest), new MattressJSAuditExcutor());// 床垫接口产品补充审核撤审

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -7,6 +7,7 @@ using JLHHJSvr.Tools;
 using LJLib.DAL.SQL;
 using Microsoft.SqlServer.Server;
 using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -695,15 +696,15 @@ namespace JLHHJSvr.Helper
             if (key.Contains("_EMPTY")) key = "";
             if (mx.mtrlid > 0 && key.Equals(mx.chastr) && powerArr.Contains(mx.formulakind.Value))
             {
-                if (mx.formulakind == 0 || mx.formulakind == 1 || mx.formulakind == 2 || mx.formulakind == 3)
+                if (mx.formulakind == 0 || mx.formulakind == 1 || mx.formulakind == 2 || mx.formulakind == 3 || mx.formulakind == 4)
                 {
                     name_arr[0] = AppendToString(name_arr[0], SplitNameCount(mx.mtrlname, Convert.ToInt32(mx.qty.Value)));
                 }
-                if (mx.formulakind == 40 || mx.formulakind == 41 || mx.formulakind == 42 || mx.formulakind == 43)
+                if (mx.formulakind == 40 || mx.formulakind == 41 || mx.formulakind == 42 || mx.formulakind == 43 || mx.formulakind == 44)
                 {
                     name_arr[1] = AppendToString(name_arr[1], SplitNameCount(mx.mtrlname, Convert.ToInt32(mx.qty.Value)));
                 }
-                if (mx.formulakind == 50 || mx.formulakind == 51 || mx.formulakind == 52 || mx.formulakind == 53)
+                if (mx.formulakind == 50 || mx.formulakind == 51 || mx.formulakind == 52 || mx.formulakind == 53 || mx.formulakind == 54)
                 {
                     var mtrlname_temp = mx.mtrlname;
                     if (!(mx.mtrlname.IndexOf("分") > -1 && mx.thickness == 0 || mx.if_inputqty == 1))
@@ -712,12 +713,12 @@ namespace JLHHJSvr.Helper
                     }
                     name_arr[2] = AppendToString(name_arr[2], SplitNameCount(mtrlname_temp, Convert.ToInt32(mx.qty.Value)));
                 }
-                if (mx.formulakind == 60 || mx.formulakind == 61 || mx.formulakind == 62 || mx.formulakind == 63)
+                if (mx.formulakind == 60 || mx.formulakind == 61 || mx.formulakind == 62 || mx.formulakind == 63 || mx.formulakind == 64)
                 {
                     name_arr[3] = AppendToString(name_arr[3], SplitNameCount(mx.mtrlname, Convert.ToInt32(mx.qty.Value)));
                 }
 
-                if (mx.formulakind == 80 || mx.formulakind == 81)
+                if (mx.formulakind == 80 || mx.formulakind == 81 || mx.formulakind == 84)
                 {
                     name_arr[0] = AppendToString(name_arr[0], mx.mtrlname);
                 }
@@ -1457,7 +1458,8 @@ namespace JLHHJSvr.Helper
                 { 13,"毡类" },
                 { 14,"打底无纺布" },
                 { 29,"网面布料" },
-                { 999,"床网" }
+                { 999,"床网" },
+                {1201,"顶布裥棉" }
             };
             var chastrSet = new HashSet<string>() { "大侧", "小侧1", "小侧2", "小侧3", "V侧1", "V侧2", "V侧3" };
             var countDict = new Dictionary<string, int>();
@@ -1476,11 +1478,12 @@ namespace JLHHJSvr.Helper
                 if (mx.mtrlid > 0 && new int[] { 32, 12, 13, 14, 29 }.Contains(mx.formulakind.Value))
                 {
                     this.ProcessWangMianBLPrdPf(mx, qdList, mx.chastr, kindDict[mx.formulakind.Value], ++countDict[key]);
-                }
-
-                if (mx.formulakind == 999)
+                } else if (mx.formulakind == 999)
                 {
                     this.ProcessChuangWangPrdPf(mx, qdList, mx.chastr, ++countDict[key]);
+                } else if(mx.formulakind == 1201)
+                {
+                    // 不需要操作
                 }
             }
 

JLHHJSvr/Helper/MattressHelper.cs

@@ -1819,13 +1819,15 @@ namespace JLHHJSvr.Helper
         public List<u_mattress> GetMattressSubspecs(int mattressid)
         {
             var list = new List<u_mattress>();
-            var outputFields = @"mattressid,mattresscode,mattress_width,mattress_length,mattress_height,parentid";
+            var outputFields = @"mattressid,mattresscode,mattress_width,mattress_length,mattress_height,mattressname,mattressrelcode,parentid";
             var selectStr = @"SELECT 
 		                            mattressid,
 		                            mattresscode,
 		                            mattress_width,
 		                            mattress_length,
 		                            mattress_height,
+		                            mattressname,
+		                            mattressrelcode,
 		                            parentid
                                 FROM u_mattress
                                 ";
@@ -1846,16 +1848,19 @@ namespace JLHHJSvr.Helper
         public List<u_mattress_mx_mtrl> GetMattressSubspecsBednet(int mattressid)
         {
             var list = new List<u_mattress_mx_mtrl>();
-            var outputFields = @"mattressid,mtrlid,spring_qty_width,spring_qty_length";
+            var outputFields = @"mattressid,mtrlid,spring_qty_width,spring_qty_length,bednet_iffork,bednet_fork_qty";
             var selectStr = @"SELECT
                                 u_mattress_mx_mtrl.mattressid,
                                 u_mattress_mx_mtrl.mattressmxid,
 				                u_mattress_mx_mtrl.mtrlid,
 				                ISNULL(u_bednetmx.spring_qty_width, 0) AS spring_qty_width,
-				                ISNULL(u_bednetmx.spring_qty_length, 0) AS spring_qty_length
+				                ISNULL(u_bednetmx.spring_qty_length, 0) AS spring_qty_length,
+				                ISNULL(u_bednet.iffork, 0) AS bednet_iffork,
+				                ISNULL(u_bednet.fork_qty, 0) AS bednet_fork_qty
 			                FROM u_mattress_mx_mtrl
 			                LEFT JOIN u_mattress_formula On u_mattress_formula.formulaid = u_mattress_mx_mtrl.formulaid
 			                LEFT OUTER JOIN u_bednetmx on u_bednetmx.bednetid = u_mattress_mx_mtrl.mtrlid
+			                LEFT OUTER JOIN u_bednet on u_bednetmx.bednetid = u_bednet.bednetid
                                 ";
             var whereList = new List<string>();
             whereList.Add("u_mattress_formula.formulatype = 99");

JLHHJSvr/JLHHJSvr.csproj

@@ -123,6 +123,7 @@
     <Compile Include="Com\Model\u_mattress_mx_extra.cs" />
     <Compile Include="Com\Model\u_mattress_mx_subspecs.cs" />
     <Compile Include="Com\Model\u_bcpcompare.cs" />
+    <Compile Include="Com\ReCalculateERPCost.cs" />
     <Compile Include="Com\SaveMattressExtraType.cs" />
     <Compile Include="Com\SaveMattressExtra.cs" />
     <Compile Include="Com\UnLockUser.cs" />
@@ -316,6 +317,7 @@
     <Compile Include="Excutor\ImportMtrlPriceByExcelExcutor.cs" />
     <Compile Include="Excutor\JLH_FetchPriceExcutor.cs" />
     <Compile Include="Excutor\ChangePasswordExcutor.cs" />
+    <Compile Include="Excutor\ReCalculateERPCostExcutor.cs" />
     <Compile Include="Excutor\SaveMattressExtraTypeExcutor.cs" />
     <Compile Include="Excutor\SaveMattressExtraExcutor.cs" />
     <Compile Include="Excutor\UnLockUserExcutor.cs" />

JLHWEB/src/api/interface/index.ts

@@ -1354,4 +1354,7 @@ export namespace Mattress {
     bednetMxs?: any[];
     mtrllist?: any[];
   }
+  export interface ResReCalculateERPCost {
+    logMsg: string;
+  }
 }

JLHWEB/src/api/modules/quote.ts

@@ -190,3 +190,10 @@ export const GetResetWiptype = (params: Mattress.ReqGetResetWiptype) => {
 export const UpdateL1Basicinfo = () => {
   return http.post<Mattress.ResUpdateL1Basicinfo>(PORT1 + `/UpdateL1Basicinfo`, {});
 };
+
+/**
+ * @name 床垫报价：重算ERP成本
+ */
+export const ReCalculateERPCost = (params: Mattress.ReqMultiMattressBcp) => {
+  return http.post<Mattress.ResUpdateL1Basicinfo>(PORT1 + `/ReCalculateERPCost`, params);
+};

JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -1465,7 +1465,9 @@ const dataCallbackSubspecs = (data: any) => {
       mattress_length: item.mattress_length,
       mattress_height: item.mattress_height,
       mattressid: item.mattressid,
-      mattresscode: item.mattresscode
+      mattresscode: item.mattresscode,
+      mattressname: item.mattressname,
+      mattressrelcode: item.mattressrelcode
     };
     let bednetMxs = data.bednetMxs.filter((t: any) => t.mattressid == item.mattressid);
     console.log("dataCallbackSubspecs bednetMxs :>> ", bednetMxs);
@@ -1475,6 +1477,8 @@ const dataCallbackSubspecs = (data: any) => {
         .map((bItem, idx) => {
           _item["spring_qty_width_" + (idx + 1)] = bItem.spring_qty_width;
           _item["spring_qty_length_" + (idx + 1)] = bItem.spring_qty_length;
+          _item["bednet_iffork_" + (idx + 1)] = bItem.bednet_iffork;
+          _item["bednet_fork_qty_" + (idx + 1)] = bItem.bednet_fork_qty;
         });
     }
 
@@ -2972,7 +2976,9 @@ const toAddMx_subSpecs = async () => {
       mattresscode: "",
       mattress_width: 0,
       mattress_length: 0,
-      mattress_height: LjDetailRef.value._mainData.mattress_height
+      mattress_height: LjDetailRef.value._mainData.mattress_height,
+      mattressname: LjDetailRef.value._mainData.mattressname,
+      mattressrelcode: LjDetailRef.value._mainData.mattressrelcode
       // spring_qty_length: 0,
       // spring_qty_width: 0
     };

JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -5226,6 +5226,20 @@ export const useHooks = (t?: any) => {
 
   const columnsMx_subSpecs: any = [
     { type: "checkbox", width: 50, fixed: "left" },
+    {
+      title: "核价编码",
+      field: "mattressrelcode",
+      editRender: {
+        name: "$input"
+      }
+    },
+    {
+      title: "核价名称",
+      field: "mattressname",
+      editRender: {
+        name: "$input"
+      }
+    },
     {
       title: "床垫宽/CM",
       field: "mattress_width",
@@ -5773,6 +5787,15 @@ export const useHooks = (t?: any) => {
                 name: "$input"
               }
             });
+            // 床网使用弹叉
+            cols.push({
+              title: "弹叉数量" + "-床网" + (idx + 1),
+              field: "bednet_fork_qty_" + (idx + 1),
+              datatype: "integer",
+              editRender: {
+                name: "$input"
+              }
+            });
           }
         });
         // }

JLHWEB/src/views/quote/mattressQuote/index.vue

@@ -57,7 +57,13 @@
 <script setup lang="ts" name="mattressQuote">
 import { ref, onMounted, inject } from "vue";
 import { useRouter } from "vue-router";
-import { SaveMattressAuditing, DelMattress, CopyMattressAudited, ReCalculateNoAudit } from "@/api/modules/quote";
+import {
+  SaveMattressAuditing,
+  DelMattress,
+  CopyMattressAudited,
+  ReCalculateNoAudit,
+  ReCalculateERPCost
+} from "@/api/modules/quote";
 import { CommonDynamicSelect } from "@/api/modules/common";
 import { ColumnProps } from "@/components/LjVxeTable/interface";
 import LjDrawer from "@/components/LjDrawer/index.vue";
@@ -483,7 +489,37 @@ const action: detailAction[] = [
   buttonDefault({
     label: t("common.recalculateERPCost"),
     power: 72,
-    clickFunc: item => {}
+    clickFunc: async item => {
+      const { curRecords } = getCurrentRecords(vxeTableRef.value);
+
+      console.log("curRecords :>> ", curRecords);
+      if (!curRecords.length) {
+        ElMessage.warning(t("business.tips.mattress.records"));
+        return;
+      }
+
+      let list = curRecords.map((item: any) => {
+        return { mattressid: Number(item.mattressid) };
+      });
+
+      ElMessageBox.confirm(`是否确定要批重算${curRecords.length}张床垫报价单吗?`, "询问", {
+        confirmButtonText: t("common.okText"),
+        cancelButtonText: "否",
+        type: "warning"
+      })
+        .then(() => {
+          ReCalculateERPCost({ list }).then((res: any) => {
+            ElMessage.success(res.logMsg);
+            vxeTableRef.value.refresh();
+          });
+        })
+        .catch((e: TypeError) => {
+          ElMessage({
+            type: "info",
+            message: "操作取消"
+          });
+        });
+    }
   })
 ];
 

JLHWEB/src/views/system/selector/codemx/index.vue

@@ -64,7 +64,7 @@ import { CommonDynamicSelect } from "@/api/modules/common";
 
 const { prefixCls } = useDesign("saletask-selector");
 const { t } = useI18n();
-const dwname = "web_configure_codemxlist";
+const dwname = "web_configure_codemxlist_select";
 const extraLoading = ref(false);
 const drawerVisible = ref(false);
 const newDate = dayjs().format("YYYY-MM-DD HH:mm:ss");
@@ -161,7 +161,7 @@ const getData = (params: any) => {
   delete params.pageSize;
   newParams.queryParams = initParams.value;
   console.log("params :>> ", newParams);
-  newParams.dsname = dwname;
+  newParams.dsname = "web_configure_codemxlist";
   return CommonDynamicSelect(newParams, dwname);
 };