Merge branch 'master' of http://110.40.230.242:3000/root/FMS24

FMS24/FMS.BLL/Bd/BdMoudleBodyBLL.cs

@@ -39,7 +39,7 @@ namespace FMS.BLL
   
          public void Delete(BLLContext context,List<string> listGuid)
          {
-		          throw new NotImplementedException("代码未实现");
+		          //throw new NotImplementedException("代码未实现");
 
                    foreach (string guid in listGuid)
                     {
@@ -48,34 +48,28 @@ namespace FMS.BLL
                    }
          }
  
-        public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
+        public void Save(BLLContext context,List<EntityBase> saveEntity,bool isAdd)
         {
-		       throw new NotImplementedException("代码未实现");
-
-                BD_MOUDLE_BODY bdMoudleBody= new BD_MOUDLE_BODY(BD_MOUDLE_BODY.Fields.GUID);
-                bdMoudleBody.Data = saveEntity.Data;
+            //throw new NotImplementedException("代码未实现");
+            BD_MOUDLE_BODY bdMoudleBody = null;
+            foreach (EntityBase entityBase in saveEntity)
+            {
+                bdMoudleBody = new BD_MOUDLE_BODY(BD_MOUDLE_BODY.Fields.GUID);
+                bdMoudleBody.Data = entityBase.Data;
                 bdMoudleBody.EffectDataFields();
 
-				val.SaveValidate(context,bdMoudleBody,isAdd);
+                val.SaveValidate(context, bdMoudleBody, isAdd);
 
-                 if (isAdd)
-                 {
-                      bdMoudleBody.GUID = Guid.NewGuid().ToString("N");
-                      bdMoudleBody.AddOperInfo(context, isAdd);
-					 
-					  bdMoudleBody.Validate();
-                      bdMoudleBody.Insert(context.Transaction);
-                 }
-                else
-                {
-                     bdMoudleBody.AddOperInfo(context, isAdd);
-					 bdMoudleBody.NotSave("CREATE_DATE,CREATE_USER");
+                BD_MOUDLE_BODY.DAL.Delete().Where(a=>a.GUID=bdMoudleBody.GUID).Execute(context.ts);
+                
+                    bdMoudleBody.GUID = Guid.NewGuid().ToString("N");
+                    bdMoudleBody.AddUserInfo(context, isAdd, false);
 
-					 bdMoudleBody.Validate();
-                     bdMoudleBody.Update(context.Transaction);
-                }
+                    bdMoudleBody.Validate();
+                    bdMoudleBody.Insert(context.Transaction);
+            }
 
-               return bdMoudleBody;
+               //return bdMoudleBody;
 
          }
 	   

FMS24/FMS.BLL/Bd/BdMoudleHeadBLL.cs

@@ -39,7 +39,7 @@ namespace FMS.BLL
   
          public void Delete(BLLContext context,List<string> listGuid)
          {
-		          throw new NotImplementedException("代码未实现");
+		          //throw new NotImplementedException("代码未实现");
 
                    foreach (string guid in listGuid)
                     {
@@ -50,7 +50,7 @@ namespace FMS.BLL
  
         public EntityBase Save(BLLContext context,EntityBase saveEntity,bool isAdd)
         {
-		       throw new NotImplementedException("代码未实现");
+		       //throw new NotImplementedException("代码未实现");
 
                 BD_MOUDLE_HEAD bdMoudleHead= new BD_MOUDLE_HEAD(BD_MOUDLE_HEAD.Fields.GUID);
                 bdMoudleHead.Data = saveEntity.Data;
@@ -61,14 +61,15 @@ namespace FMS.BLL
                  if (isAdd)
                  {
                       bdMoudleHead.GUID = Guid.NewGuid().ToString("N");
-                      bdMoudleHead.AddOperInfo(context, isAdd);
+                bdMoudleHead.AddUserInfo(context, isAdd, true);
+                //bdMoudleHead.AddOperInfo(context, isAdd);
 					 
 					  bdMoudleHead.Validate();
                       bdMoudleHead.Insert(context.Transaction);
                  }
                 else
                 {
-                     bdMoudleHead.AddOperInfo(context, isAdd);
+                     bdMoudleHead.AddUserInfo(context, isAdd, false);
 					 bdMoudleHead.NotSave("CREATE_DATE,CREATE_USER");
 
 					 bdMoudleHead.Validate();

FMS24/FMS.SO/BdMoudleBody/BdMoudleBodySave.cs

@@ -18,7 +18,7 @@ namespace FMS.SO
             EntityBase saveEntity = context.Request.Entity;
             bool isAdd = context.Request.IsAdd;
 
-            context.Response.Entity =BdMoudleBodyBLL.Instance.Save(context.BLLContext,saveEntity,isAdd);
+            BdMoudleBodyBLL.Instance.Save(context.BLLContext, context.Request.ListEntity, isAdd);
 
             context.Response.Message =isAdd? "新增成功":"修改成功";
            

FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx

@@ -17,6 +17,25 @@
                 window.location.href = url;
             }
         }
+        //提示保存成功
+        function saveSucess() {
+            msg.alert("保存成功!");
+            // msg.alert("保存成功!", { closed: refresh });
+        }
+        //删除确认
+        function deleteAction(obj) {
+
+            if (!eci.selectRow()) {
+
+                msg.error("请选择删除数据!");
+
+                return false;
+
+            } else {
+
+                msg.confirm("确定要执行删除操作吗?", obj);
+            }
+        }
 
 
     </script>
@@ -24,12 +43,12 @@
 <body>
     <form id="form1" runat="server">
         <input type="hidden" id="hidKey" runat="server" />
-        <input type="hidden" id="hidBizType" runat="server" />        
+        <input type="hidden" id="hidBizType" runat="server" />
         <input type="hidden" id="hidMoudle" runat="server" />
 
         <div id="root">
 
-            <asp:ETitle runat="server" ID="pagetitle" Title="服务模板表头维护"></asp:ETitle>
+            <%--<asp:ETitle runat="server" ID="pagetitle" Title="服务模板表头维护"></asp:ETitle>--%>
 
             <div id="toolbar" class="toolbar">
                 <asp:EButton runat="server" ID="btnSave" Text="保存" NeedCheck="true" ValidateId="tbEdit" OnClick="btnSave_Click" Icon="save" />
@@ -57,7 +76,7 @@
                         <td class="lbl">模板类型</td>
                         <td>
                             <asp:ECombox runat="server" ID="cboMoudleType" DataField="MOUDLE_TYPE" ECIType="MOUDLE_TYPE" Width="85%" ReadOnly="true"></asp:ECombox></td>
-                        
+
                         <td class="lbl">模板名称</td>
                         <td>
                             <asp:ETextBox runat="server" ID="txtMoudleName" DataField="MOUDLE_NAME" NotNull="true" Width="85%"></asp:ETextBox></td>
@@ -73,28 +92,29 @@
                     </tr>
                     <tr>
                         <td class="lbl" colspan="8"></td>
-                       
+
 
                     </tr>
 
                 </table>
             </div>
             <div id="toolbar2">
-                <asp:EButton runat="server" ID="btnAdd2" Text="新增" Icon="Add" CancelLoading="true"  OnClick="btnAdd_Click" />
+                <asp:EButton runat="server" ID="btnAdd2" Text="新增" Icon="Add" CancelLoading="true" OnClick="btnAdd_Click" />
+                <asp:EButton runat="server" ID="btnDelete" Text="删除" Icon="delete" IsClient="true" OnClientClick="return deleteAction(this)" OnClick="btnDelete2_Click" />
             </div>
             <div id="datagrid">
 
-                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server" 
-                    FitWindow="true"  EnableSorting="True" EnableSelect="false"   EnablePaging="false" EnableClickSelectRow="true"  OnRowDataBound="gvData_RowDataBound"
-                    Width="1000px" KeyField="GUID"  HAlign="center"> 
+                <asp:EGridView ID="gvData" Layout="divQuery,toolbar,pagetitle" runat="server"
+                    FitWindow="true" EnableSorting="True" EnableSelect="True" EnablePaging="false" EnableClickSelectRow="true" OnRowDataBound="gvData_RowDataBound"
+                    Width="1000px" KeyField="GUID" HAlign="center">
                     <Columns>
-                          <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
+                        <%--  <asp:TemplateField HeaderText="删除" ItemStyle-HorizontalAlign="Center" ItemStyle-Width="80">
                             <ItemTemplate>
-                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" IsClient="true" OnClientClick="return deleteAction2(this);"  CommandArgument='<%#Eval("GUID")%>'  OnClick="btnDelete2_Click" />
+                                <asp:EButton runat="server" Icon="Delete" ID="btnDelete" Text="删除" CommandArgument='<%#Eval("GUID")%>'  OnClick="btnDelete2_Click" />
 
                             </ItemTemplate>
-                        </asp:TemplateField>
-                          <asp:ETemplateField  HeaderText="应收服务" DataField="SERVICE_ID" TwoWay="cboServiceId" SortExpression="SERVICE_ID"  ItemStyle-Width="150px">
+                        </asp:TemplateField>--%>
+                        <asp:ETemplateField HeaderText="应收服务" DataField="SERVICE_ID" TwoWay="cboServiceId" SortExpression="SERVICE_ID" ItemStyle-Width="150px">
                             <ItemTemplate>
                                 <asp:ECombox runat="server" ID="cboServiceId" AddEmpty="true" DataField="SERVICE_ID" ECIType="SFMC" Width="85%"></asp:ECombox>
                             </ItemTemplate>
@@ -104,14 +124,14 @@
                                 <asp:EChoose runat="server" ID="txtCustomName" Text='<%# Eval("CUSTOM_NAME")%>' Tag="NotNull" headertext="请选择客户" ECIType="	CUSTOMER" Width="85%"></asp:EChoose>
                             </ItemTemplate>
                         </asp:ETemplateField>
-                          <asp:ETemplateField HeaderText="收费标准" DataField="RECEIVE_STANDARD_ID" TwoWay="cboReceiveStandardId" SortExpression="RECEIVE_STANDARD_ID"  ItemStyle-Width="150px">
+                        <asp:ETemplateField HeaderText="收费标准" DataField="RECEIVE_STANDARD_ID" TwoWay="cboReceiveStandardId" SortExpression="RECEIVE_STANDARD_ID" ItemStyle-Width="150px">
                             <ItemTemplate>
                                 <asp:ECombox runat="server" ID="cboReceiveStandardId" AddEmpty="true" DataField="RECEIVE_STANDARD_ID" ECIType="SFBZ" Width="85%"></asp:ECombox>
                             </ItemTemplate>
                         </asp:ETemplateField>
                         <asp:ETemplateField HeaderText="单价" DataField="RECEIVE_PRICE" TwoWay="txtReceivePrice" SortExpression="RECEIVE_PRICE" ItemStyle-Width="100px" ItemStyle-HorizontalAlign="Right">
                             <ItemTemplate>
-                                <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_PRICE")) %>' Style="text-align: right;" ID="txtReceivePrice" Tag="NotNull" headertext="单价" 
+                                <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_PRICE")) %>' Style="text-align: right;" ID="txtReceivePrice" Tag="NotNull" headertext="单价"
                                     DataField="RECEIVE_PRICE" Width="85%" IsFloat="true"></asp:ETextBox>
                             </ItemTemplate>
                         </asp:ETemplateField>
@@ -130,20 +150,20 @@
                                 <asp:ETextBox runat="server" Text='<%# String.Format("{0:f4}",Eval("RECEIVE_MAX")) %>' Style="text-align: right;" ID="txtReceiveMax" Tag="NotNull" headertext="最高收费" DataField="RECEIVE_MAX" Width="85%" IsFloat="true"></asp:ETextBox>
                             </ItemTemplate>
                         </asp:ETemplateField>
-                          <asp:ETemplateField HeaderText="小数长度" DataField="DECIMAL_LENGTH" TwoWay="cboDecimalLength" SortExpression="DECIMAL_LENGTH"  ItemStyle-Width="100px">
+                        <asp:ETemplateField HeaderText="小数长度" DataField="DECIMAL_LENGTH" TwoWay="cboDecimalLength" SortExpression="DECIMAL_LENGTH" ItemStyle-Width="100px">
                             <ItemTemplate>
                                 <asp:ECombox runat="server" ID="cboDecimalLength" AddEmpty="true" DataField="DECIMAL_LENGTH" ECIType="XSW" Width="85%"></asp:ECombox>
                             </ItemTemplate>
                         </asp:ETemplateField>
-                          <asp:ETemplateField HeaderText="进位方式" DataField="RECEIVE_MANTISSA_TYPE_ID" TwoWay="cboReceiveMantissaTypeId" SortExpression="RECEIVE_MANTISSA_TYPE_ID"  ItemStyle-Width="100px">
+                        <asp:ETemplateField HeaderText="进位方式" DataField="RECEIVE_MANTISSA_TYPE_ID" TwoWay="cboReceiveMantissaTypeId" SortExpression="RECEIVE_MANTISSA_TYPE_ID" ItemStyle-Width="100px">
                             <ItemTemplate>
                                 <asp:ECombox runat="server" ID="cboReceiveMantissaTypeId" AddEmpty="true" DataField="RECEIVE_MANTISSA_TYPE_ID" ECIType="JSFS" Width="85%"></asp:ECombox>
                             </ItemTemplate>
                         </asp:ETemplateField>
-                      <asp:BoundField DataField="HEAD_GUID" HeaderText="表头主键" SortExpression="HEAD_GUID"  ItemStyle-Width="0"></asp:BoundField>
+                        <asp:BoundField DataField="HEAD_GUID" HeaderText="表头主键" SortExpression="HEAD_GUID" ItemStyle-Width="0"></asp:BoundField>
+                        <asp:BoundField DataField="CUSTOM_CODE" HeaderText="客户编码" SortExpression="CUSTOM_CODE" ItemStyle-Width="0"></asp:BoundField>
 
-                      <%--<asp:BoundField DataField="SERVICE_ID" HeaderText="服务编号" SortExpression="SERVICE_ID"  ItemStyle-Width="150"></asp:BoundField>
-                      <asp:BoundField DataField="CUSTOM_CODE" HeaderText="客户编码" SortExpression="CUSTOM_CODE"  ItemStyle-Width="150"></asp:BoundField>
+                        <%--<asp:BoundField DataField="SERVICE_ID" HeaderText="服务编号" SortExpression="SERVICE_ID"  ItemStyle-Width="150"></asp:BoundField>
                       <asp:BoundField DataField="CUSTOM_NAME" HeaderText="客户名称" SortExpression="CUSTOM_NAME"  ItemStyle-Width="150"></asp:BoundField>
                       <asp:BoundField DataField="RECEIVE_STANDARD_ID" HeaderText="收费标准" SortExpression="RECEIVE_STANDARD_ID"  ItemStyle-Width="150"></asp:BoundField>
                       <asp:BoundField DataField="RECEIVE_PRICE" HeaderText="收费单价" SortExpression="RECEIVE_PRICE"  ItemStyle-Width="150"></asp:BoundField>
@@ -152,8 +172,7 @@
                       <asp:BoundField DataField="RECEIVE_MAX" HeaderText="最高收费" SortExpression="RECEIVE_MAX"  ItemStyle-Width="150"></asp:BoundField>
                       <asp:BoundField DataField="DECIMAL_LENGTH" HeaderText="小数长度" SortExpression="DECIMAL_LENGTH"  ItemStyle-Width="150"></asp:BoundField>
                       <asp:BoundField DataField="RECEIVE_MANTISSA_TYPE_ID" HeaderText="进位方式" SortExpression="RECEIVE_MANTISSA_TYPE_ID"  ItemStyle-Width="150"></asp:BoundField>--%>
-
-                   </Columns>
+                    </Columns>
                 </asp:EGridView>
             </div>
         </div>

FMS24/Web/AppFms/Bd/frmBdMoudleHeadEdit.aspx.cs

@@ -70,13 +70,13 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
         this.Bind(data);
 
         EciRequest requestBody = new EciRequest(FMSService.BdMoudleBodyLoad);
-        request.Key = this.key;
+        requestBody.Key = this.key;
 
-        EciResponse responseBody = SOA.Execute(request);
+        EciResponse responseBody = SOA.Execute(requestBody);
 
-        BD_MOUDLE_BODY dataBody = response.DataTable.ToEntity<BD_MOUDLE_BODY>();
+        DataTable dt = responseBody.DataTable;
 
-        this.Bind(dataBody);
+        this.gvData.EDataSource=dt;
     }
 
     protected void btnSave_Click(object sender, EventArgs e)
@@ -89,10 +89,14 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
 
         request.Entity = saveEntity;
 
-        saveEntity.Data = this.GetEntityFromUI().Data;
+        //saveEntity.Data = this.GetEntityFromUI().Data;
 
         saveEntity.GUID = this.key;
-
+        saveEntity.BIZ_TYPE = this.biztype;
+        saveEntity.MOUDLE_TYPE = this.moudle;
+        saveEntity.MOUDLE_NAME = this.txtMoudleName.Text;
+        saveEntity.START_PORT=this.txtStartPort.Text;
+        saveEntity.REAMRK=this.txtReamrk.Text;
         EciResponse response = SOA.Execute(request);
 
         BD_MOUDLE_HEAD data = response.Entity.Upgrade<BD_MOUDLE_HEAD>();
@@ -107,25 +111,46 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
             //this.txtCreateUser.Text = this.UserInfo.UserName;
 
         }
-
+        //保存表体
+        Save(data.GUID);
         //this.txtUpdateDate.Text = DateTime.Now.ToFullString();
         //this.txtUpdateUser.Text = this.UserInfo.UserName;
 
-        response.Message.Tip();
+        this.LoadRecord();
+        //"保存成功".Alert();
+        HtmlWindow.Onload("saveSucess()");
+        //response.Message.Tip();
     }
     protected void btnDelete2_Click(object sender, EventArgs e)
     {
-        Button btn = sender as Button;
-        string key = btn.CommandArgument;
-
-        EciRequest request = new EciRequest(FMSService.BdMoudleBodyDelete);
-
-        request.ListKey = new List<string>() { key };
-
-        SOA.Execute(request);
+        List<string> list = new List<string>();
+        DataTable dt = gvData.DataTable(true);
+        DataTable tempDt = dt.Clone();
+        //先删除有GUID的
+        foreach (DataRow dr in dt.Rows)
+        {
+            if (dr.Checked())
+            {
+                if (dr["GUID"].ToString().HasValue())
+                {
+                    list.Add(dr["GUID"].ToString());
+                }
+            }
+            else
+            {
+                tempDt.Rows.Add(dr.ItemArray);
+            }
+        }
+        if (list.Count > 0)
+        {
+            EciRequest request = new EciRequest(FMSService.BdMoudleBodyDelete);
+            request.ListKey = list;
+            SOA.Execute(request);
+        }
+        gvData.EDataSource = tempDt;
 
         EAlert.Tip("删除执行成功");
-
+        this.LoadRecord();
         //this.Search();
     }
 
@@ -154,7 +179,10 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
             cboDecimalLength.InitItems();
             cboReceiveMantissaTypeId.InitItems();
 
-
+            cboServiceId.SelectedValue = DataBinder.Eval(e.Row.DataItem, "SERVICE_ID").ToString();
+            cboReceiveStandardId.SelectedValue = DataBinder.Eval(e.Row.DataItem, "RECEIVE_STANDARD_ID").ToString();
+            cboDecimalLength.SelectedValue = DataBinder.Eval(e.Row.DataItem, "DECIMAL_LENGTH").ToString();
+            cboReceiveMantissaTypeId.SelectedValue = DataBinder.Eval(e.Row.DataItem, "RECEIVE_MANTISSA_TYPE_ID").ToString();
         }
     }
     /// <summary>
@@ -171,7 +199,7 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
             DataRow dr = dt.NewRow();
             //默认状态(草稿)
             dr["HEAD_GUID"] = this.key;
-            dr["SERVICE_ID"] = this.biztype;
+            //dr["SERVICE_ID"] = this.biztype;
 
             dt.Rows.Add(dr);
         }
@@ -180,4 +208,37 @@ public partial class AppFms_ServiceMoudle_frmBdMoudleHeadEdit : BasePage
         int rowNum = dt.Rows.Count;
         HtmlWindow.Onload("setFocus(" + rowNum + ")");
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <exception cref="AppException"></exception>
+    private void Save(string guid)
+    {
+        DataTable dt = gvData.DataTable(true);
+        if (dt.Rows.Count <= 0)
+        {
+            throw new AppException("当前列表没有可操作的数据");
+        }
+
+        List<BD_MOUDLE_BODY> entityList = dt.ToListEntity<BD_MOUDLE_BODY>();
+        List<BD_MOUDLE_BODY> newEntityList = new List<BD_MOUDLE_BODY>();
+        for (int i = 0; i < entityList.Count; i++)
+        {
+            BD_MOUDLE_BODY entity = entityList[i];
+            entity.GROUP_CODE = UserInfo.GroupCode;
+            entity.GROUP_NAME = UserInfo.GroupName;
+            entity.HEAD_GUID = guid;
+            entity.CUSTOM_CODE = entityList[i].CUSTOM_NAME.Split('|')[0];
+            entity.CUSTOM_NAME = entityList[i].CUSTOM_NAME.Split('|')[1];
+            newEntityList.Add(entity);
+        }
+        if (newEntityList.Count == 0)
+        {
+            throw new AppException("当前列表中没有要保存的数据");
+        }
+        EciRequest request = new EciRequest(FMSService.BdMoudleBodySave);
+        request.SetListEntity<BD_MOUDLE_BODY>(newEntityList);
+        EciResponse response = request.Execute();
+    }
 }

FMS24/Web/AppFms/Bd/frmBdMoudleHeadList.aspx

@@ -21,8 +21,11 @@
         }
 
         function editAction(obj) {
+            var biztype = $(obj).getField("BIZ_TYPE");
+            var type = $(obj).getField("MOUDLE_TYPE");
             var key = $(obj).getKey();
-            var url = "frmBdMoudleHeadEdit.aspx?key=" + key;
+            var url = "frmBdMoudleHeadEdit.aspx?key=" + key + "&biztype=" + biztype + "&moudle=" + type;
+            console.log(url)
             eci.open(url);
         }