diff --git a/DataBase/版本日志/SUBQHSE_V2025-12-03-xiaj（资料收发文类别）.sql b/DataBase/版本日志/SUBQHSE_V2025-12-03-xiaj（资料收发文类别）.sql new file mode 100644 index 00000000..ebc48616 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-12-03-xiaj（资料收发文类别）.sql @@ -0,0 +1,50 @@ + +--շ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Base_ReceivingDocType') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[Base_ReceivingDocType]( + [TypeId] [nvarchar](50) NOT NULL, + [TypeName] [nvarchar](50) NULL, + [SortIndex] [int] NULL, + CONSTRAINT [PK_Base_ReceivingDocType] PRIMARY KEY CLUSTERED +( + [TypeId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] +) ON [PRIMARY] + + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'շ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ReceivingDocType' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ReceivingDocType', @level2type=N'COLUMN',@level2name=N'TypeId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ReceivingDocType', @level2type=N'COLUMN',@level2name=N'TypeName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ReceivingDocType', @level2type=N'COLUMN',@level2name=N'SortIndex' + +END + +GO + + +--շ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'DFE17AE1-F23D-4EE2-8F82-116F16E433DF') +BEGIN + insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + values('DFE17AE1-F23D-4EE2-8F82-116F16E433DF','շ','BaseInfo/ReceivingDocType.aspx',40,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) +END +GO + +--˵ť +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'DFE17AE1-F23D-4EE2-8F82-116F16E433DF') +BEGIN +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'7E7863BD-8C46-413E-B6CF-DAE1468ED589', N'DFE17AE1-F23D-4EE2-8F82-116F16E433DF', N'', 1); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'6BA582C9-3864-4898-9CA4-018284F0E261', N'DFE17AE1-F23D-4EE2-8F82-116F16E433DF', N'޸', 2); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'5B576A63-31F7-4440-99CF-AF2B4BD71BCC', N'DFE17AE1-F23D-4EE2-8F82-116F16E433DF', N'ɾ', 3); +INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex]) +VALUES (N'4DA1BA90-7CE5-4CE9-A636-70A3C0F03C60', N'DFE17AE1-F23D-4EE2-8F82-116F16E433DF', N'', 4); +END +GO + + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 0c4bfeb6..8799ebce 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -133,6 +133,7 @@ + diff --git a/SGGL/BLL/BaseInfo/ReceivingDocTypeService.cs b/SGGL/BLL/BaseInfo/ReceivingDocTypeService.cs new file mode 100644 index 00000000..09eb6b0a --- /dev/null +++ b/SGGL/BLL/BaseInfo/ReceivingDocTypeService.cs @@ -0,0 +1,125 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.UI.WebControls; + +namespace BLL +{ + public class ReceivingDocTypeService + { + /// + /// 获取实体集合 + /// + /// + public static List GetList() + { + var q = (from x in Funs.DB.Base_ReceivingDocType orderby x.SortIndex select x).ToList(); + return q; + } + /// + /// 添加 + /// + /// + public static void AddReceivingDocType(Model.Base_ReceivingDocType model) + { + Model.SGGLDB db = Funs.DB; + Model.Base_ReceivingDocType newModel = new Model.Base_ReceivingDocType + { + TypeId = model.TypeId, + TypeName = model.TypeName, + SortIndex = model.SortIndex + }; + + db.Base_ReceivingDocType.InsertOnSubmit(newModel); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateReceivingDocType(Model.Base_ReceivingDocType model) + { + Model.SGGLDB db = Funs.DB; + Model.Base_ReceivingDocType newModel = db.Base_ReceivingDocType.FirstOrDefault(e => e.TypeId == model.TypeId); + if (newModel != null) + { + newModel.TypeName = model.TypeName; + newModel.SortIndex = model.SortIndex; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除信息 + /// + /// + public static void DeleteReceivingDocTypeById(string TypeId) + { + Model.SGGLDB db = Funs.DB; + Model.Base_ReceivingDocType model = db.Base_ReceivingDocType.FirstOrDefault(e => e.TypeId == TypeId); + { + db.Base_ReceivingDocType.DeleteOnSubmit(model); + db.SubmitChanges(); + } + } + /// + /// 资料收发文类别下拉框 + /// + /// + /// + public static void InitReceivingDocTypeDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "Value"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetReceivingDocTypeItem(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 资料收发文类别下拉框 + /// + /// + /// + public static void InitReceivingDocType(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "Text"; + dropName.DataTextField = "Text"; + dropName.DataSource = GetReceivingDocTypeItem(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + + /// + /// 获取资料收发文类别集合 + /// + /// + public static ListItem[] GetReceivingDocTypeItem() + { + var q = (from x in Funs.DB.Base_ReceivingDocType orderby x.SortIndex select x).ToList(); + ListItem[] list = new ListItem[q.Count()]; + for (int i = 0; i < q.Count(); i++) + { + list[i] = new ListItem(q[i].TypeName ?? "", q[i].TypeId); + } + return list; + } + + /// + /// 获取一个资料收发文类别信息 + /// + /// + /// + public static Model.Base_ReceivingDocType GetReceivingDocType(string TypeId) + { + return Funs.DB.Base_ReceivingDocType.FirstOrDefault(e => e.TypeId == TypeId); + } + } +} diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 55dd6399..b8b50bf3 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1132,6 +1132,11 @@ namespace BLL /// 质量问题类别定义 /// public const string QualityQuestionTypeMenuId = "24F9A1ED-0F4C-407C-8EB3-2A8711BB6ECC"; + + /// + /// 资料收发文类别 + /// + public const string ReceivingDocTypeMenuId = "24F9A1ED-0F4C-407C-8EB3-2A8711BB6ECC"; #endregion #region 项目设置 diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx new file mode 100644 index 00000000..e7a4ef9e --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx @@ -0,0 +1,100 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReceivingDocType.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.ReceivingDocType" %> + + + + + +资料收发文类别 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.cs new file mode 100644 index 00000000..e394fa44 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.cs @@ -0,0 +1,177 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; + +namespace FineUIPro.Web.BaseInfo +{ + public partial class ReceivingDocType : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + GetButtonPower(); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + + // 绑定表格 + BindGrid(); + btnNew.OnClientClick = Window1.GetShowReference("ReceivingDocTypeEdit.aspx") + "return false;"; + } + } + /// + /// 绑定数据 + /// + + public void BindGrid() + { + DataTable tb = BindData(); + Grid1.RecordCount = tb.Rows.Count; + tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + + Grid1.DataSource = table; + Grid1.DataBind(); + } + + + protected DataTable BindData() + { + string strSql = @"select TypeId,TypeName,SortIndex from [dbo].[Base_ReceivingDocType] where 1=1 "; + + List listStr = new List(); + if (!string.IsNullOrEmpty(this.txtTypeName.Text.Trim())) + { + strSql += " AND TypeName like @TypeName"; + listStr.Add(new SqlParameter("@TypeName", "%" + this.txtTypeName.Text.Trim() + "%")); + } + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + return tb; + } + protected void btnMenuModify_Click(object sender, EventArgs e) + { + EditData(); + } + + protected void btnMenuDel_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + BLL.ReceivingDocTypeService.DeleteReceivingDocTypeById(rowID); + } + + BindGrid(); + ShowNotify("删除数据成功!", MessageBoxIcon.Success); + } + } + + /// + /// 编辑数据方法 + /// + private void EditData() + { + + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + //if (this.btnMenuModify.Hidden) ////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面 + //{ + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReceivingDocTypeView.aspx?TypeId={0}", Grid1.SelectedRowID, "查看 - "))); + //} + //else + //{ + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReceivingDocTypeEdit.aspx?TypeId={0}", Grid1.SelectedRowID, "编辑 - "))); + //} + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + if (Request.Params["value"] == "0") + { + return; + } + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ReceivingDocTypeMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuModify.Hidden = false; + } + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnMenuDel.Hidden = false; + } + } + } + #endregion + + + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(); + } + + + protected void btnMenuView_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReceivingDocTypeView.aspx?TypeId={0}", Grid1.SelectedRowID, "查看 - "))); + } + + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + /// + /// 重置 + /// + /// + /// + protected void btnRset_Click(object sender, EventArgs e) + { + txtTypeName.Text = ""; + BindGrid(); + } + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.designer.cs new file mode 100644 index 00000000..3cf2cfff --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocType.aspx.designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class ReceivingDocType + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtTypeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTypeName; + + /// + /// btnSearch 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSearch; + + /// + /// btnRset 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnRset; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// lblPageIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblPageIndex; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuModify 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuModify; + + /// + /// btnMenuDel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDel; + } +} diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx new file mode 100644 index 00000000..45ac0697 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx @@ -0,0 +1,44 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReceivingDocTypeEdit.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.ReceivingDocTypeEdit" %> + + + + + + 资料收发文类别 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.cs new file mode 100644 index 00000000..ad3d5cf3 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.cs @@ -0,0 +1,63 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.BaseInfo +{ + public partial class ReceivingDocTypeEdit : PageBase + { + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + string TypeId = Request.Params["TypeId"]; + if (!string.IsNullOrEmpty(TypeId)) + { + + Model.Base_ReceivingDocType model = BLL.ReceivingDocTypeService.GetReceivingDocType(TypeId); + if (model != null) + { + this.txtTypeName.Text = model.TypeName; + if (model.SortIndex != null) + { + this.txtSortIndex.Text = model.SortIndex.ToString(); + } + } + } + } + } + + protected void btnSave_Click(object sender, EventArgs e) + { + SaveData(true); + } + + private void SaveData(bool b) + { + string TypeId = Request.Params["TypeId"]; + Model.Base_ReceivingDocType model = new Model.Base_ReceivingDocType(); + model.TypeName = this.txtTypeName.Text.Trim(); + if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim())) + { + model.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim()); + } + if (!string.IsNullOrEmpty(TypeId)) + { + model.TypeId = TypeId; + BLL.ReceivingDocTypeService.UpdateReceivingDocType(model); + } + else + { + model.TypeId = SQLHelper.GetNewID(typeof(Model.Base_ReceivingDocType)); + BLL.ReceivingDocTypeService.AddReceivingDocType(model); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.designer.cs new file mode 100644 index 00000000..5f1122d6 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/ReceivingDocTypeEdit.aspx.designer.cs @@ -0,0 +1,98 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class ReceivingDocTypeEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtTypeName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTypeName; + + /// + /// txtSortIndex 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtSortIndex; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hdCheckerId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdCheckerId; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx index 8562a53e..f62b8464 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx @@ -22,16 +22,42 @@ - - + <%-- - + --%> + + + + + + - + + + + + + + + + + + + + + + + + + + - @@ -106,7 +132,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs index 34bccde7..d9ab3174 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.cs @@ -20,6 +20,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { if (!IsPostBack) { + BLL.UnitService.GetUnit(this.drpSendUnitId, this.CurrUser.LoginProjectId, true);//发件单位 + BLL.UnitService.GetUnit(this.drpReceiveUnit, this.CurrUser.LoginProjectId, true);//接收单位 + BLL.ReceivingDocTypeService.InitReceivingDocType(this.drpFileType, true);//文件类别 + BLL.CNProfessionalService.InitCNProfessionalDocDownList(this.drpCNProfessionalId, true);//专业 GetButtonPower(); BindGrid(); } @@ -62,15 +66,55 @@ namespace FineUIPro.Web.CQMS.Comprehensive List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.stxtFileCode.Text.Trim())) + //if (!string.IsNullOrEmpty(this.stxtFileName.Text.Trim())) + //{ + // strSql += " AND doc.FileName LIKE @stxtFileName"; + // listStr.Add(new SqlParameter("@stxtFileName", "%" + stxtFileName.Text.Trim() + "%")); + //} + if (!string.IsNullOrEmpty(this.txtFile.Text.Trim())) { - strSql += " AND doc.FileCode LIKE @stxtFileCode"; - listStr.Add(new SqlParameter("@stxtFileCode", "%" + stxtFileCode.Text.Trim() + "%")); + strSql += " AND (doc.FileCode LIKE @txtFile or doc.FileName LIKE @txtFile)"; + listStr.Add(new SqlParameter("@txtFile", "%" + txtFile.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(this.stxtFileName.Text.Trim())) + if (this.drpFileType.SelectedValue != BLL.Const._Null) { - strSql += " AND doc.FileName LIKE @stxtFileName"; - listStr.Add(new SqlParameter("@stxtFileName", "%" + stxtFileName.Text.Trim() + "%")); + strSql += " AND doc.FileType =@FileType"; + listStr.Add(new SqlParameter("@FileType", drpFileType.SelectedValue)); + } + if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + { + strSql += " AND doc.CNProfessionalId =@CNProfessionalId"; + listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessionalId.SelectedValue)); + } + if (this.drpSendUnitId.SelectedValue != BLL.Const._Null) + { + strSql += " AND doc.SendUnit = @SendUnit"; + listStr.Add(new SqlParameter("@SendUnit", this.drpSendUnitId.SelectedValue)); + } + if (this.drpReceiveUnit.SelectedValue != BLL.Const._Null) + { + strSql += " AND doc.ReceiveUnit like @ReceiveUnit"; + listStr.Add(new SqlParameter("@ReceiveUnit", "%" + this.drpReceiveUnit.SelectedValue + "%")); + } + if (!string.IsNullOrEmpty(this.txtReceiveDateStart.Text.Trim())) + { + strSql += " AND doc.ReceiveDate >= @ReceiveDateStart"; + listStr.Add(new SqlParameter("@ReceiveDateStart", Funs.GetNewDateTime(this.txtReceiveDateStart.Text.Trim()))); + } + if (!string.IsNullOrEmpty(this.txtReceiveDateEnd.Text.Trim())) + { + strSql += " AND doc.ReceiveDate <= @ReceiveDateEnd"; + listStr.Add(new SqlParameter("@ReceiveDateEnd", Funs.GetNewDateTime(this.txtReceiveDateEnd.Text.Trim()))); + } + if (!string.IsNullOrEmpty(txtSendDateStart.Text.Trim())) + { + strSql += " AND doc.SendDate >= @SendDateStart"; + listStr.Add(new SqlParameter("@SendDateStart", Funs.GetNewDateTime(txtSendDateStart.Text.Trim()))); + } + if (!string.IsNullOrEmpty(txtSendDateEnd.Text.Trim())) + { + strSql += " AND doc.SendDate <= @SendDateEnd"; + listStr.Add(new SqlParameter("@SendDateEnd", Funs.GetNewDateTime(txtSendDateEnd.Text.Trim()))); } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); @@ -339,14 +383,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive var lists = (from x in Funs.DB.Comprehensive_DataReceivingDoc where x.ProjectId == this.CurrUser.LoginProjectId select x); - if (!string.IsNullOrEmpty(this.stxtFileCode.Text.Trim())) + if (!string.IsNullOrEmpty(this.txtFile.Text.Trim())) { - lists = lists.Where(x => x.FileCode.Contains(stxtFileCode.Text.Trim())); - } - if (!string.IsNullOrEmpty(this.stxtFileName.Text.Trim())) - { - lists = lists.Where(x => x.FileName.Contains(this.stxtFileName.Text.Trim())); + lists = lists.Where(x => x.FileCode.Contains(txtFile.Text.Trim()) || x.FileName.Contains(txtFile.Text.Trim())); } + //if (!string.IsNullOrEmpty(this.stxtFileName.Text.Trim())) + //{ + // lists = lists.Where(x => x.FileName.Contains(this.stxtFileName.Text.Trim())); + //} lists = lists.OrderBy(x => x.RemarkCode); if (lists != null) { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.designer.cs index fd1c5666..8c51c60f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class DataReceivingDoc { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class DataReceivingDoc + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// ToolSearch 控件。 /// @@ -56,25 +58,43 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar ToolSearch; - + /// - /// stxtFileCode 控件。 + /// txtFile 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox stxtFileCode; - + protected global::FineUIPro.TextBox txtFile; + /// - /// stxtFileName 控件。 + /// drpFileType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox stxtFileName; - + protected global::FineUIPro.DropDownList drpFileType; + + /// + /// drpCNProfessionalId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCNProfessionalId; + + /// + /// drpSendUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpSendUnitId; + /// /// btnSearch 控件。 /// @@ -83,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// btnNew 控件。 /// @@ -92,7 +112,79 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// txtReceiveDateStart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReceiveDateStart; + + /// + /// Label5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label5; + + /// + /// txtReceiveDateEnd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReceiveDateEnd; + + /// + /// txtSendDateStart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtSendDateStart; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label4; + + /// + /// txtSendDateEnd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtSendDateEnd; + + /// + /// drpReceiveUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpReceiveUnit; + /// /// btnImport 控件。 /// @@ -101,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// btnOut 控件。 /// @@ -110,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// lblPageIndex 控件。 /// @@ -119,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label3 控件。 /// @@ -128,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// Label1 控件。 /// @@ -137,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// Label2 控件。 /// @@ -146,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// ToolbarText1 控件。 /// @@ -155,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -164,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -173,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -182,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Menu1 控件。 /// @@ -191,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -200,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInNew.aspx.cs index bb7bf7ae..0a3011a9 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInNew.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocDataInNew.aspx.cs @@ -323,6 +323,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; var cns = from x in Funs.DB.Base_CNProfessional select x; + var docType = from x in Funs.DB.Base_ReceivingDocType select x; var dataInTemp = from x in Funs.DB.Sys_CQMS_DataInTemp where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "DataReceivingDoc" @@ -370,7 +371,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive } if (!string.IsNullOrEmpty(tempData.Value4.Trim())) { - Ins.FileType = tempData.Value4.Trim(); + //Ins.FileType = tempData.Value4.Trim(); + + var dType = docType.Where(x => x.TypeName == tempData.Value4.Trim()).FirstOrDefault(); + if (dType == null) + { + errInfo += "文件类别[" + tempData.Value4.Trim() + "]不存在；"; + } + else + { + Ins.FileType = dType.TypeName; + } } else { diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx index 5773e88a..6a9eedbd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx @@ -29,8 +29,9 @@ - - + <%-- + --%> + <%----%> @@ -119,8 +120,8 @@ <%----%> - - + + <%-- diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs index d7159bba..23708ae6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.cs @@ -1,5 +1,7 @@ using BLL; +using FineUIPro.Web.OfficeCheck.Check; using System; +using System.EnterpriseServices.CompensatingResourceManager; using System.Linq; using System.Web.UI.WebControls; @@ -55,7 +57,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtFileCode.Readonly = true; this.txtFileName.Readonly = true; this.txtReceiveDate.Readonly = true; - this.txtFileType.Readonly = true; + //this.txtFileType.Readonly = true; + this.drpFileType.Readonly = true; this.drpCNProfessionalId.Readonly = true; //this.drpSendUnit.Readonly = true; this.drpSendUnitId.Readonly = true; @@ -92,6 +95,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.GetUnit(this.drpSendUnitId, this.CurrUser.LoginProjectId, false);//发件单位 BLL.UnitService.GetUnit(this.drpReceiveUnit, this.CurrUser.LoginProjectId, false);//接收单位 BLL.UnitService.GetUnit(this.drpIssueToUnit, this.CurrUser.LoginProjectId, false);//下发至单位 + BLL.ReceivingDocTypeService.InitReceivingDocType(this.drpFileType, false);//文件类别 BLL.CNProfessionalService.InitCNProfessionalDocDownList(this.drpCNProfessionalId, true);//专业 //LoadAuditSelect(); //this.agree.Hidden = true; @@ -100,33 +104,47 @@ namespace FineUIPro.Web.CQMS.Comprehensive //this.btnSave.Hidden = true; //this.btnSubmit.Hidden = true; this.DataReceivingDocId = Request.Params["DataReceivingDocId"]; - Model.Comprehensive_DataReceivingDoc dataReceivingDoc = BLL.DataReceivingDocService.GetDataReceivingDocById(this.DataReceivingDocId); - if (dataReceivingDoc != null) + Model.Comprehensive_DataReceivingDoc model = BLL.DataReceivingDocService.GetDataReceivingDocById(this.DataReceivingDocId); + if (model != null) { //this.hdAttachUrl.Text = this.DataReceivingDocId; - this.txtFileCode.Text = dataReceivingDoc.FileCode; - this.txtFileName.Text = dataReceivingDoc.FileName; - this.txtReceiveDate.Text = dataReceivingDoc.ReceiveDate.HasValue ? string.Format("{0:yyyy-MM-dd}", dataReceivingDoc.ReceiveDate) : ""; - this.txtFileType.Text = dataReceivingDoc.FileType; - if (!string.IsNullOrEmpty(dataReceivingDoc.SendUnit)) + this.txtFileCode.Text = model.FileCode; + this.txtFileName.Text = model.FileName; + this.txtReceiveDate.Text = model.ReceiveDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReceiveDate) : ""; + //this.txtFileType.Text = model.FileType; + if (!string.IsNullOrWhiteSpace(model.FileType)) { - //this.drpSendUnit.SelectedValueArray = dataReceivingDoc.SendUnit.Split(','); - this.drpSendUnitId.SelectedValue = dataReceivingDoc.SendUnit; + bool containsValue = drpFileType.Items.FindByValue(model.FileType) != null; + if (containsValue) + { + // 存在指定的值 + this.drpFileType.SelectedValue = model.FileType; + } + else + { + // 不存在指定的值 + this.drpFileType.Text = model.FileType; + } } - if (!string.IsNullOrEmpty(dataReceivingDoc.CNProfessionalId)) + if (!string.IsNullOrEmpty(model.SendUnit)) { - this.drpCNProfessionalId.SelectedValue = dataReceivingDoc.CNProfessionalId; + //this.drpSendUnit.SelectedValueArray = model.SendUnit.Split(','); + this.drpSendUnitId.SelectedValue = model.SendUnit; } - this.txtCopies.Text = dataReceivingDoc.Copies.HasValue ? dataReceivingDoc.Copies.ToString() : ""; - this.txtSendMan.Text = dataReceivingDoc.SendMan; - this.txtDocumentHandler.Text = dataReceivingDoc.DocumentHandler; - this.txtSendDate.Text = dataReceivingDoc.SendDate.HasValue ? string.Format("{0:yyyy-MM-dd}", dataReceivingDoc.SendDate) : ""; - if (!string.IsNullOrEmpty(dataReceivingDoc.ReceiveUnit)) + if (!string.IsNullOrEmpty(model.CNProfessionalId)) { - this.drpReceiveUnit.SelectedValueArray = dataReceivingDoc.ReceiveUnit.Split(','); + this.drpCNProfessionalId.SelectedValue = model.CNProfessionalId; } - this.txtReceiveMan.Text = dataReceivingDoc.ReceiveMan; - if (dataReceivingDoc.IsReply == true) + this.txtCopies.Text = model.Copies.HasValue ? model.Copies.ToString() : ""; + this.txtSendMan.Text = model.SendMan; + this.txtDocumentHandler.Text = model.DocumentHandler; + this.txtSendDate.Text = model.SendDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.SendDate) : ""; + if (!string.IsNullOrEmpty(model.ReceiveUnit)) + { + this.drpReceiveUnit.SelectedValueArray = model.ReceiveUnit.Split(','); + } + this.txtReceiveMan.Text = model.ReceiveMan; + if (model.IsReply == true) { this.rblIsReply.SelectedValue = "true"; } @@ -134,17 +152,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.rblIsReply.SelectedValue = "false"; } - this.txtReturnWuhuangDate.Text = dataReceivingDoc.ReturnWuhuangDate.HasValue ? string.Format("{0:yyyy-MM-dd}", dataReceivingDoc.ReturnWuhuangDate) : ""; - this.txtRetrunWuhuangCopies.Text = dataReceivingDoc.RetrunWuhuangCopies.HasValue ? dataReceivingDoc.RetrunWuhuangCopies.ToString() : ""; - if (!string.IsNullOrEmpty(dataReceivingDoc.IssueToUnit)) + this.txtReturnWuhuangDate.Text = model.ReturnWuhuangDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReturnWuhuangDate) : ""; + this.txtRetrunWuhuangCopies.Text = model.RetrunWuhuangCopies.HasValue ? model.RetrunWuhuangCopies.ToString() : ""; + if (!string.IsNullOrEmpty(model.IssueToUnit)) { - this.drpIssueToUnit.SelectedValueArray = dataReceivingDoc.IssueToUnit.Split(','); + this.drpIssueToUnit.SelectedValueArray = model.IssueToUnit.Split(','); } - this.txtIssueCopies.Text = dataReceivingDoc.IssueCopies.HasValue ? dataReceivingDoc.IssueCopies.ToString() : ""; - this.txtIssueUnitReceiver.Text = dataReceivingDoc.IssueUnitReceiver; - if (dataReceivingDoc.IsOnFile.HasValue) + this.txtIssueCopies.Text = model.IssueCopies.HasValue ? model.IssueCopies.ToString() : ""; + this.txtIssueUnitReceiver.Text = model.IssueUnitReceiver; + if (model.IsOnFile.HasValue) { - if (dataReceivingDoc.IsOnFile == true) + if (model.IsOnFile == true) { this.rblIsOnFile.SelectedValue = "true"; } @@ -153,13 +171,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.rblIsOnFile.SelectedValue = "false"; } } - this.txtRemarkCode.Text = dataReceivingDoc.RemarkCode.HasValue ? dataReceivingDoc.RemarkCode.ToString() : ""; + this.txtRemarkCode.Text = model.RemarkCode.HasValue ? model.RemarkCode.ToString() : ""; - //var currApprove = DataReceivingDocApproveService.GetCurrentApprove(dataReceivingDoc.DataReceivingDocId); + //var currApprove = DataReceivingDocApproveService.GetCurrentApprove(model.DataReceivingDocId); //if (currApprove != null) //{ //重新编制 编制人 可以 显示 提交 保存按钮 // this.drpAudit.SelectedValue = currApprove.ApproveMan; - // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && dataReceivingDoc.CompileMan == CurrUser.UserId) + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && model.CompileMan == CurrUser.UserId) // { // this.btnSubmit.Hidden = false; // this.btnSave.Hidden = false; @@ -177,7 +195,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive //}//没有当前审核人，已完成状态 或者 待提交状态 //else //{ - // if (dataReceivingDoc.Status == BLL.Const.Comprehensive_Compile && dataReceivingDoc.CompileMan == CurrUser.UserId) + // if (model.Status == BLL.Const.Comprehensive_Compile && model.CompileMan == CurrUser.UserId) // { // this.btnSubmit.Hidden = false; // this.btnSave.Hidden = false; @@ -202,30 +220,44 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected void btnSave_Click(object sender, EventArgs e) { - if (drpSendUnitId.SelectedValue==BLL.Const._Null) + if (drpSendUnitId.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择发件单位！", MessageBoxIcon.Warning); return; } + if ((string.IsNullOrWhiteSpace(drpFileType.Text) && string.IsNullOrWhiteSpace(drpFileType.SelectedValue)) || drpFileType.SelectedValue == BLL.Const._Null) + { + Alert.ShowInTop("请选择文件类别！", MessageBoxIcon.Warning); + return; + } if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) { Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); return; } - var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null))); + var q = Funs.DB.Comprehensive_DataReceivingDoc.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DataReceivingDocId != this.DataReceivingDocId || (this.DataReceivingDocId == null && x.DataReceivingDocId != null))); if (q != null) { Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); return; } - Model.Comprehensive_DataReceivingDoc dataReceivingDoc = new Model.Comprehensive_DataReceivingDoc(); - dataReceivingDoc.ProjectId = this.CurrUser.LoginProjectId; - dataReceivingDoc.FileCode = this.txtFileCode.Text.Trim(); - dataReceivingDoc.FileName = this.txtFileName.Text.Trim(); - dataReceivingDoc.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text.Trim()); - dataReceivingDoc.FileType = this.txtFileType.Text.Trim(); - dataReceivingDoc.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + Model.Comprehensive_DataReceivingDoc model = new Model.Comprehensive_DataReceivingDoc(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.FileCode = this.txtFileCode.Text.Trim(); + model.FileName = this.txtFileName.Text.Trim(); + model.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text.Trim()); + //model.FileType = this.txtFileType.Text.Trim(); + //model.FileType = this.drpFileType.SelectedValue; + if (this.drpFileType.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpFileType.SelectedValue)) + { + model.FileType = this.drpFileType.SelectedValue; + } + else + { + model.FileType = this.drpFileType.Text; + } + model.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; //string unitIds = string.Empty; //var unitList = this.drpSendUnit.SelectedValueArray; //foreach (var item in unitList) @@ -236,12 +268,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive //{ // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); //} - //dataReceivingDoc.SendUnit = unitIds; - dataReceivingDoc.SendUnit = this.drpSendUnitId.SelectedValue; - dataReceivingDoc.SendMan = this.txtSendMan.Text.Trim(); - dataReceivingDoc.Copies = Funs.GetNewInt(this.txtCopies.Text.Trim()); - dataReceivingDoc.DocumentHandler = this.txtDocumentHandler.Text.Trim(); - dataReceivingDoc.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); + //model.SendUnit = unitIds; + model.SendUnit = this.drpSendUnitId.SelectedValue; + model.SendMan = this.txtSendMan.Text.Trim(); + model.Copies = Funs.GetNewInt(this.txtCopies.Text.Trim()); + model.DocumentHandler = this.txtDocumentHandler.Text.Trim(); + model.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); string receivingUnits = string.Empty; var receivingUnitList = this.drpReceiveUnit.SelectedValueArray; foreach (var item in receivingUnitList) @@ -252,11 +284,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { receivingUnits = receivingUnits.Substring(0, receivingUnits.LastIndexOf(",")); } - dataReceivingDoc.ReceiveUnit = receivingUnits; - dataReceivingDoc.ReceiveMan = this.txtReceiveMan.Text.Trim(); - dataReceivingDoc.IsReply = Convert.ToBoolean(this.rblIsReply.SelectedValue); - dataReceivingDoc.ReturnWuhuangDate = Funs.GetNewDateTime(this.txtReturnWuhuangDate.Text.Trim()); - dataReceivingDoc.RetrunWuhuangCopies = Funs.GetNewInt(this.txtRetrunWuhuangCopies.Text.Trim()); + model.ReceiveUnit = receivingUnits; + model.ReceiveMan = this.txtReceiveMan.Text.Trim(); + model.IsReply = Convert.ToBoolean(this.rblIsReply.SelectedValue); + model.ReturnWuhuangDate = Funs.GetNewDateTime(this.txtReturnWuhuangDate.Text.Trim()); + model.RetrunWuhuangCopies = Funs.GetNewInt(this.txtRetrunWuhuangCopies.Text.Trim()); string issueToUnits = string.Empty; var issueToUnitLists = this.drpIssueToUnit.SelectedValueArray; foreach (var item in issueToUnitLists) @@ -267,53 +299,53 @@ namespace FineUIPro.Web.CQMS.Comprehensive { issueToUnits = issueToUnits.Substring(0, issueToUnits.LastIndexOf(",")); } - dataReceivingDoc.IssueToUnit = issueToUnits; - dataReceivingDoc.IssueCopies = Funs.GetNewInt(this.txtIssueCopies.Text.Trim()); - dataReceivingDoc.IssueUnitReceiver = this.txtIssueUnitReceiver.Text.Trim(); + model.IssueToUnit = issueToUnits; + model.IssueCopies = Funs.GetNewInt(this.txtIssueCopies.Text.Trim()); + model.IssueUnitReceiver = this.txtIssueUnitReceiver.Text.Trim(); if (!string.IsNullOrEmpty(this.rblIsOnFile.SelectedValue)) { - dataReceivingDoc.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue); + model.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue); } - dataReceivingDoc.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + model.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) //{ - // dataReceivingDoc.AuditMan = drpAudit.SelectedValue; + // model.AuditMan = drpAudit.SelectedValue; //} //审核人 if (string.IsNullOrEmpty(this.DataReceivingDocId)) { //if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) //{ - // dataReceivingDoc.DataReceivingDocId = this.hdAttachUrl.Text; + // model.DataReceivingDocId = this.hdAttachUrl.Text; //} //else //{ - dataReceivingDoc.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); - //this.hdAttachUrl.Text = dataReceivingDoc.DataReceivingDocId; + model.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); + //this.hdAttachUrl.Text = model.DataReceivingDocId; //} - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceivingDoc.DataReceivingDocId); + //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == model.DataReceivingDocId); //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) //{ // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); // return; //} - dataReceivingDoc.CompileMan = this.CurrUser.UserId; - dataReceivingDoc.CompileDate = DateTime.Now; - //dataReceivingDoc.Status = BLL.Const.Comprehensive_Compile; - dataReceivingDoc.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); - BLL.DataReceivingDocService.AddDataReceivingDoc(dataReceivingDoc); + model.CompileMan = this.CurrUser.UserId; + model.CompileDate = DateTime.Now; + //model.Status = BLL.Const.Comprehensive_Compile; + model.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); + BLL.DataReceivingDocService.AddDataReceivingDoc(model); } else { - dataReceivingDoc.DataReceivingDocId = this.DataReceivingDocId; + model.DataReceivingDocId = this.DataReceivingDocId; //var model = Funs.DB.Comprehensive_DataReceivingDoc.Where(u => u.DataReceivingDocId == this.DataReceivingDocId).FirstOrDefault(); //if (model != null) //{ - // dataReceivingDoc.Status = model.Status; + // model.Status = model.Status; //} //else //{ - // dataReceivingDoc.Status = BLL.Const.Comprehensive_Compile; + // model.Status = BLL.Const.Comprehensive_Compile; //} //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingDocId); //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) @@ -321,7 +353,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); // return; //} - BLL.DataReceivingDocService.UpdateDataReceivingDoc(dataReceivingDoc); + BLL.DataReceivingDocService.UpdateDataReceivingDoc(model); } PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } @@ -339,13 +371,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); // return; // } - // Model.Comprehensive_DataReceivingDoc dataReceivingDoc = new Model.Comprehensive_DataReceivingDoc(); - // dataReceivingDoc.ProjectId = this.CurrUser.LoginProjectId; - // dataReceivingDoc.FileCode = this.txtFileCode.Text.Trim(); - // dataReceivingDoc.FileName = this.txtFileName.Text.Trim(); - // dataReceivingDoc.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text.Trim()); - // dataReceivingDoc.FileType = this.txtFileType.Text.Trim(); - // dataReceivingDoc.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // Model.Comprehensive_DataReceivingDoc model = new Model.Comprehensive_DataReceivingDoc(); + // model.ProjectId = this.CurrUser.LoginProjectId; + // model.FileCode = this.txtFileCode.Text.Trim(); + // model.FileName = this.txtFileName.Text.Trim(); + // model.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text.Trim()); + // model.FileType = this.txtFileType.Text.Trim(); + // model.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; // //string unitIds = string.Empty; // //var unitList = this.drpSendUnit.SelectedValueArray; // //foreach (var item in unitList) @@ -356,11 +388,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive // //{ // // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); // //} - // dataReceivingDoc.SendUnit = drpSendUnitId.SelectedValue; - // dataReceivingDoc.SendMan = this.txtSendMan.Text.Trim(); - // dataReceivingDoc.Copies = Funs.GetNewInt(this.txtCopies.Text.Trim()); - // dataReceivingDoc.DocumentHandler = this.txtDocumentHandler.Text.Trim(); - // dataReceivingDoc.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); + // model.SendUnit = drpSendUnitId.SelectedValue; + // model.SendMan = this.txtSendMan.Text.Trim(); + // model.Copies = Funs.GetNewInt(this.txtCopies.Text.Trim()); + // model.DocumentHandler = this.txtDocumentHandler.Text.Trim(); + // model.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); // string receivingUnits = string.Empty; // var receivingUnitList = this.drpReceiveUnit.SelectedValueArray; // foreach (var item in receivingUnitList) @@ -371,11 +403,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive // { // receivingUnits = receivingUnits.Substring(0, receivingUnits.LastIndexOf(",")); // } - // dataReceivingDoc.ReceiveUnit = receivingUnits; - // dataReceivingDoc.ReceiveMan = this.txtReceiveMan.Text.Trim(); - // dataReceivingDoc.IsReply = Convert.ToBoolean(this.rblIsReply.SelectedValue); - // dataReceivingDoc.ReturnWuhuangDate = Funs.GetNewDateTime(this.txtReturnWuhuangDate.Text.Trim()); - // dataReceivingDoc.RetrunWuhuangCopies = Funs.GetNewInt(this.txtRetrunWuhuangCopies.Text.Trim()); + // model.ReceiveUnit = receivingUnits; + // model.ReceiveMan = this.txtReceiveMan.Text.Trim(); + // model.IsReply = Convert.ToBoolean(this.rblIsReply.SelectedValue); + // model.ReturnWuhuangDate = Funs.GetNewDateTime(this.txtReturnWuhuangDate.Text.Trim()); + // model.RetrunWuhuangCopies = Funs.GetNewInt(this.txtRetrunWuhuangCopies.Text.Trim()); // string issueToUnits = string.Empty; // var issueToUnitLists = this.drpIssueToUnit.SelectedValueArray; // foreach (var item in issueToUnitLists) @@ -386,40 +418,40 @@ namespace FineUIPro.Web.CQMS.Comprehensive // { // issueToUnits = issueToUnits.Substring(0, issueToUnits.LastIndexOf(",")); // } - // dataReceivingDoc.IssueToUnit = issueToUnits; - // dataReceivingDoc.IssueCopies = Funs.GetNewInt(this.txtIssueCopies.Text.Trim()); - // dataReceivingDoc.IssueUnitReceiver = this.txtIssueUnitReceiver.Text.Trim(); - // dataReceivingDoc.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue); + // model.IssueToUnit = issueToUnits; + // model.IssueCopies = Funs.GetNewInt(this.txtIssueCopies.Text.Trim()); + // model.IssueUnitReceiver = this.txtIssueUnitReceiver.Text.Trim(); + // model.IsOnFile = Convert.ToBoolean(this.rblIsOnFile.SelectedValue); // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) // { - // dataReceivingDoc.AuditMan = drpAudit.SelectedValue; + // model.AuditMan = drpAudit.SelectedValue; // } //审核人 // if (string.IsNullOrEmpty(this.DataReceivingDocId)) // { // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) // { - // dataReceivingDoc.DataReceivingDocId = this.hdAttachUrl.Text; + // model.DataReceivingDocId = this.hdAttachUrl.Text; // } // else // { - // dataReceivingDoc.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); - // this.hdAttachUrl.Text = dataReceivingDoc.DataReceivingDocId; + // model.DataReceivingDocId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); + // this.hdAttachUrl.Text = model.DataReceivingDocId; // } - // var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataReceivingDoc.DataReceivingDocId); + // var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == model.DataReceivingDocId); // if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) // { // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); // return; // } - // dataReceivingDoc.CompileMan = this.CurrUser.UserId; - // dataReceivingDoc.CompileDate = DateTime.Now; - // dataReceivingDoc.Status = BLL.Const.Comprehensive_Audit; - // BLL.DataReceivingDocService.AddDataReceivingDoc(dataReceivingDoc); + // model.CompileMan = this.CurrUser.UserId; + // model.CompileDate = DateTime.Now; + // model.Status = BLL.Const.Comprehensive_Audit; + // BLL.DataReceivingDocService.AddDataReceivingDoc(model); // } // else // { - // dataReceivingDoc.DataReceivingDocId = this.DataReceivingDocId; + // model.DataReceivingDocId = this.DataReceivingDocId; // var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.DataReceivingDocId); // if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) // { @@ -430,38 +462,38 @@ namespace FineUIPro.Web.CQMS.Comprehensive // if (model.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 // { - // dataReceivingDoc.Status = BLL.Const.Comprehensive_Audit; + // model.Status = BLL.Const.Comprehensive_Audit; // } // else if (model.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 // { - // dataReceivingDoc.Status = BLL.Const.Comprehensive_Audit; + // model.Status = BLL.Const.Comprehensive_Audit; // } // else //审核状态 提交 变 完成 或者 重新编制 // { // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) // { - // dataReceivingDoc.Status = BLL.Const.Comprehensive_Complete; + // model.Status = BLL.Const.Comprehensive_Complete; // } // else // { - // dataReceivingDoc.Status = BLL.Const.Comprehensive_ReCompile; + // model.Status = BLL.Const.Comprehensive_ReCompile; // } // } - // BLL.DataReceivingDocService.UpdateDataReceivingDoc(dataReceivingDoc); + // BLL.DataReceivingDocService.UpdateDataReceivingDoc(model); // } // #region 审核记录 - // var currApprove = DataReceivingDocApproveService.GetCurrentApprove(dataReceivingDoc.DataReceivingDocId); + // var currApprove = DataReceivingDocApproveService.GetCurrentApprove(model.DataReceivingDocId); // if (currApprove == null) //为获取到为 当前编制状态 直接提交 // { // var approve = new Model.Comprehensive_DataReceivingDocApprove(); - // approve.DataReceivingDocId = dataReceivingDoc.DataReceivingDocId; + // approve.DataReceivingDocId = model.DataReceivingDocId; // approve.ApproveMan = this.CurrUser.UserId; // approve.ApproveType = Const.Comprehensive_Compile; // approve.ApproveDate = DateTime.Now; // DataReceivingDocApproveService.EditApprove(approve); //新增编制记录 // Model.Comprehensive_DataReceivingDocApprove newApprove = new Model.Comprehensive_DataReceivingDocApprove(); - // newApprove.DataReceivingDocId = dataReceivingDoc.DataReceivingDocId; + // newApprove.DataReceivingDocId = model.DataReceivingDocId; // newApprove.ApproveMan = this.drpAudit.SelectedValue; // newApprove.ApproveType = Const.InspectionManagement_Audit; // DataReceivingDocApproveService.EditApprove(newApprove); //新增专业工程师审核记录 @@ -473,7 +505,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive // currApprove.ApproveDate = DateTime.Now; // DataReceivingDocApproveService.EditApprove(currApprove); //新增专业工程师审核记录 // Model.Comprehensive_DataReceivingDocApprove newApprove = new Model.Comprehensive_DataReceivingDocApprove(); - // newApprove.DataReceivingDocId = dataReceivingDoc.DataReceivingDocId; + // newApprove.DataReceivingDocId = model.DataReceivingDocId; // newApprove.ApproveMan = this.drpAudit.SelectedValue; // newApprove.ApproveType = Const.InspectionManagement_Audit; // DataReceivingDocApproveService.EditApprove(newApprove); //新增专业工程师审核记录 @@ -499,7 +531,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive // { // Model.Comprehensive_DataReceivingDocApprove reApprove = new Model.Comprehensive_DataReceivingDocApprove(); // reApprove.DataReceivingDocId = currApprove.DataReceivingDocId; - // reApprove.ApproveMan = dataReceivingDoc.CompileMan; + // reApprove.ApproveMan = model.CompileMan; // reApprove.ApproveType = Const.Comprehensive_ReCompile; // DataReceivingDocApproveService.EditApprove(reApprove); // } @@ -522,9 +554,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive // { // this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DataReceivingDoc)); // } - // var dataReceivingDoc = BLL.DataReceivingDocService.GetDataReceivingDocById(this.DataReceivingDocId); + // var model = BLL.DataReceivingDocService.GetDataReceivingDocById(this.DataReceivingDocId); - // if (dataReceivingDoc == null || ((dataReceivingDoc.CompileMan == CurrUser.UserId && dataReceivingDoc.Status == BLL.Const.Comprehensive_Compile) || (dataReceivingDoc.CompileMan == CurrUser.UserId && dataReceivingDoc.Status == BLL.Const.Comprehensive_ReCompile))) + // if (model == null || ((model.CompileMan == CurrUser.UserId && model.Status == BLL.Const.Comprehensive_Compile) || (model.CompileMan == CurrUser.UserId && model.Status == BLL.Const.Comprehensive_ReCompile))) // { // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/DataReceivingDoc&menuId={1}", this.hdAttachUrl.Text, BLL.Const.DataReceivingDocMenuId))); // } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs index d14403cf..b276be4a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDocEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive { - - - public partial class DataReceivingDocEdit { - +namespace FineUIPro.Web.CQMS.Comprehensive +{ + + + public partial class DataReceivingDocEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// SimpleForm1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// GroupPanel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.GroupPanel GroupPanel1; - + /// /// Form2 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form2; - + /// /// txtFileCode 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFileCode; - + /// /// txtFileName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtFileName; - + /// /// txtReceiveDate 控件。 /// @@ -74,16 +76,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReceiveDate; - + /// - /// txtFileType 控件。 + /// drpFileType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtFileType; - + protected global::FineUIPro.DropDownList drpFileType; + /// /// drpCNProfessionalId 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpSendUnitId 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSendUnitId; - + /// /// txtCopies 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtCopies; - + /// /// txtSendMan 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSendMan; - + /// /// txtDocumentHandler 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDocumentHandler; - + /// /// GroupPanel2 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.GroupPanel GroupPanel2; - + /// /// Form3 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form3; - + /// /// txtSendDate 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtSendDate; - + /// /// drpReceiveUnit 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpReceiveUnit; - + /// /// txtReceiveMan 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtReceiveMan; - + /// /// rblIsReply 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsReply; - + /// /// Label2 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label2; - + /// /// GroupPanel3 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.GroupPanel GroupPanel3; - + /// /// Form4 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form4; - + /// /// txtReturnWuhuangDate 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReturnWuhuangDate; - + /// /// txtRetrunWuhuangCopies 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtRetrunWuhuangCopies; - + /// /// drpIssueToUnit 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIssueToUnit; - + /// /// txtIssueCopies 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtIssueCopies; - + /// /// txtIssueUnitReceiver 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtIssueUnitReceiver; - + /// /// rblIsOnFile 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsOnFile; - + /// /// txtRemarkCode 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtRemarkCode; - + /// /// Label1 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// Label3 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label3; - + /// /// Toolbar1 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnSave 控件。 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls index da32b34d..6e83433a 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 3abc0b00..172b83e9 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -257,6 +257,8 @@ + + @@ -6779,6 +6781,20 @@ ProjectType.aspx + + ReceivingDocTypeEdit.aspx + ASPXCodeBehind + + + ReceivingDocTypeEdit.aspx + + + ReceivingDocType.aspx + ASPXCodeBehind + + + ReceivingDocType.aspx + QualityQuestionType.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml index 29b9898e..e6780f7a 100644 --- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml +++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml @@ -7,6 +7,9 @@ + + + @@ -31,6 +34,7 @@ + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f15143e0..4e3165d7 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -203,6 +203,9 @@ namespace Model partial void InsertBase_QuestionType(Base_QuestionType instance); partial void UpdateBase_QuestionType(Base_QuestionType instance); partial void DeleteBase_QuestionType(Base_QuestionType instance); + partial void InsertBase_ReceivingDocType(Base_ReceivingDocType instance); + partial void UpdateBase_ReceivingDocType(Base_ReceivingDocType instance); + partial void DeleteBase_ReceivingDocType(Base_ReceivingDocType instance); partial void InsertBase_RiskLevel(Base_RiskLevel instance); partial void UpdateBase_RiskLevel(Base_RiskLevel instance); partial void DeleteBase_RiskLevel(Base_RiskLevel instance); @@ -3324,6 +3327,14 @@ namespace Model } } + public System.Data.Linq.Table Base_ReceivingDocType + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Base_RiskLevel { get @@ -37814,6 +37825,116 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_ReceivingDocType")] + public partial class Base_ReceivingDocType : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _TypeId; + + private string _TypeName; + + private System.Nullable _SortIndex; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnTypeIdChanging(string value); + partial void OnTypeIdChanged(); + partial void OnTypeNameChanging(string value); + partial void OnTypeNameChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + #endregion + + public Base_ReceivingDocType() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string TypeId + { + get + { + return this._TypeId; + } + set + { + if ((this._TypeId != value)) + { + this.OnTypeIdChanging(value); + this.SendPropertyChanging(); + this._TypeId = value; + this.SendPropertyChanged("TypeId"); + this.OnTypeIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeName", DbType="NVarChar(50)")] + public string TypeName + { + get + { + return this._TypeName; + } + set + { + if ((this._TypeName != value)) + { + this.OnTypeNameChanging(value); + this.SendPropertyChanging(); + this._TypeName = value; + this.SendPropertyChanged("TypeName"); + this.OnTypeNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_RiskLevel")] public partial class Base_RiskLevel : INotifyPropertyChanging, INotifyPropertyChanged {