From dc8a8ad1939e84098ef5be8a77326395234a57b6 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Fri, 20 Mar 2026 19:34:45 +0800 Subject: [PATCH] 20260320 --- .../版本日志/SUBQHSE_V2026-03-20-xiaj.sql | 97 ++++ SGGL/BLL/BLL.csproj | 2 + SGGL/BLL/BaseInfo/MaterialUnitService.cs | 137 +++++ .../MaterialInAndOutRecordService.cs | 131 +++++ SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx | 156 ++++++ .../BaseInfo/MaterialUnit.aspx.cs | 284 ++++++++++ .../BaseInfo/MaterialUnit.aspx.designer.cs | 206 +++++++ .../BaseInfo/RewardAndPunishManager.aspx | 175 +++--- .../BaseInfo/RewardAndPunishManager.aspx.cs | 44 +- .../RewardAndPunishManager.aspx.designer.cs | 2 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + SGGL/Model/Model.cs | 506 ++++++++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 22 +- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 14 files changed, 1650 insertions(+), 122 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-03-20-xiaj.sql create mode 100644 SGGL/BLL/BaseInfo/MaterialUnitService.cs create mode 100644 SGGL/BLL/HSSE/InApproveManager/MaterialInAndOutRecordService.cs create mode 100644 SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx create mode 100644 SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.designer.cs diff --git a/DataBase/版本日志/SUBQHSE_V2026-03-20-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-03-20-xiaj.sql new file mode 100644 index 00000000..bce6992c --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-03-20-xiaj.sql @@ -0,0 +1,97 @@ + + + + +CREATE TABLE [dbo].[Base_MaterialUnit]( + [MaterialUnitId] [nvarchar](50) NOT NULL, + [MaterialUnitName] [nvarchar](100) NULL, + [MaterialUnitCode] [nvarchar](50) NULL, + [Remark] [nvarchar](200) NULL, + CONSTRAINT [PK_Base_MaterialUnit] PRIMARY KEY CLUSTERED +( + [MaterialUnitId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialUnit', @level2type=N'COLUMN',@level2name=N'MaterialUnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialUnit', @level2type=N'COLUMN',@level2name=N'MaterialUnitName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialUnit', @level2type=N'COLUMN',@level2name=N'MaterialUnitCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialUnit', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialUnit' +GO + + + + + + +CREATE TABLE [dbo].[MaterialInAndOutRecord]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [GoodsCategoryId] [nvarchar](50) NULL, + [GoodsCategoryName] [nvarchar](100) NULL, + [MaterialModel] [nvarchar](100) NULL, + [InOutDate] [datetime] NULL, + [UnitId] [nvarchar](50) NULL, + [InOrOut] [nvarchar](10) NULL, + [Number] [decimal](18, 2) NULL, + [MaterialUnitId] [nvarchar](50) NULL, + [Remark] [nvarchar](200) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_MaterialInAndOutRecord] PRIMARY KEY CLUSTERED +( + [Id] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'Id' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'GoodsCategoryId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'GoodsCategoryName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'MaterialModel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'InOutDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'/' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'InOrOut' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'Number' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'MaterialUnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'MaterialInAndOutRecord' +GO + + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 0a2f1a0c..9163306f 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -133,6 +133,7 @@ + @@ -484,6 +485,7 @@ + diff --git a/SGGL/BLL/BaseInfo/MaterialUnitService.cs b/SGGL/BLL/BaseInfo/MaterialUnitService.cs new file mode 100644 index 00000000..ebbb0f9f --- /dev/null +++ b/SGGL/BLL/BaseInfo/MaterialUnitService.cs @@ -0,0 +1,137 @@ +namespace BLL; +using System.Collections.Generic; +using System.Linq; +public class MaterialUnitService +{ + /// + /// 根据主键获取信息 + /// + /// + /// + public static Model.Base_MaterialUnit GetMaterialUnitById(string materialUnitId) + { + return Funs.DB.Base_MaterialUnit.FirstOrDefault(e => e.MaterialUnitId == materialUnitId); + } + + /// + /// 根据名称获取信息 + /// + /// + /// + public static Model.Base_MaterialUnit GetMaterialUnitByName(string materialUnitName) + { + return Funs.DB.Base_MaterialUnit.FirstOrDefault(e => e.MaterialUnitName == materialUnitName); + } + + #region 根据职称ID得到职称名称 + /// + /// 根据职称ID得到职称名称 + /// + /// + /// + public static string GetMaterialUnitNameById(string MaterialUnitId) + { + string MaterialUnitName = string.Empty; + if (!string.IsNullOrEmpty(MaterialUnitId)) + { + var q = GetMaterialUnitById(MaterialUnitId); + if (q != null) + { + MaterialUnitName = q.MaterialUnitName; + } + } + + return MaterialUnitName; + } + #endregion + + /// + /// 添加职称信息 + /// + /// + public static void AddMaterialUnit(Model.Base_MaterialUnit postTitle) + { + Model.SGGLDB db = Funs.DB; + Model.Base_MaterialUnit newMaterialUnit = new Model.Base_MaterialUnit + { + MaterialUnitId = postTitle.MaterialUnitId, + MaterialUnitCode = postTitle.MaterialUnitCode, + MaterialUnitName = postTitle.MaterialUnitName, + Remark = postTitle.Remark + }; + + db.Base_MaterialUnit.InsertOnSubmit(newMaterialUnit); + db.SubmitChanges(); + } + + /// + /// 修改职称信息 + /// + /// + public static void UpdateMaterialUnit(Model.Base_MaterialUnit postTitle) + { + Model.SGGLDB db = Funs.DB; + Model.Base_MaterialUnit newMaterialUnit = db.Base_MaterialUnit.FirstOrDefault(e => e.MaterialUnitId == postTitle.MaterialUnitId); + if (newMaterialUnit != null) + { + newMaterialUnit.MaterialUnitCode = postTitle.MaterialUnitCode; + newMaterialUnit.MaterialUnitName = postTitle.MaterialUnitName; + newMaterialUnit.Remark = postTitle.Remark; + db.SubmitChanges(); + } + } + + /// + /// 根据职称主键删除对应职称信息 + /// + /// + public static void DeleteMaterialUnitById(string materialUnitId) + { + Model.SGGLDB db = Funs.DB; + Model.Base_MaterialUnit postTitle = db.Base_MaterialUnit.FirstOrDefault(e => e.MaterialUnitId == materialUnitId); + { + db.Base_MaterialUnit.DeleteOnSubmit(postTitle); + db.SubmitChanges(); + } + } + + /// + /// 获取类别下拉项 + /// + /// + public static List GetMaterialUnitList() + { + var list = (from x in Funs.DB.Base_MaterialUnit orderby x.MaterialUnitCode select x).ToList(); + return list; + } + + /// + /// 获取职称下拉选项 + /// + /// + public static List GetMaterialUnitDropDownList() + { + var list = (from x in Funs.DB.Base_MaterialUnit orderby x.MaterialUnitCode select x).ToList(); + return list; + } + + #region 表下拉框 + /// + /// 表下拉框 + /// + /// 下拉框名字 + /// 是否显示请选择 + public static void InitMaterialUnitDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease) + { + dropName.DataValueField = "MaterialUnitId"; + dropName.DataTextField = "MaterialUnitName"; + dropName.DataSource = BLL.MaterialUnitService.GetMaterialUnitList(); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } + #endregion + +} \ No newline at end of file diff --git a/SGGL/BLL/HSSE/InApproveManager/MaterialInAndOutRecordService.cs b/SGGL/BLL/HSSE/InApproveManager/MaterialInAndOutRecordService.cs new file mode 100644 index 00000000..92448bfb --- /dev/null +++ b/SGGL/BLL/HSSE/InApproveManager/MaterialInAndOutRecordService.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace BLL +{ + public class MaterialInAndOutRecordService + { + /// + /// 根据主键获取物资进出记录 + /// + /// + /// + public static Model.MaterialInAndOutRecord GetMaterialInAndOutRecordById(string id) + { + return Funs.DB.MaterialInAndOutRecord.FirstOrDefault(e => e.Id == id); + } + + /// + /// 添加物资进出记录 + /// + /// + public static void AddMaterialInAndOutRecord(Model.MaterialInAndOutRecord materialInAndOutRecord) + { + Model.SGGLDB db = Funs.DB; + Model.MaterialInAndOutRecord newMaterialInAndOutRecord = + new Model.MaterialInAndOutRecord + { + Id = materialInAndOutRecord.Id, + ProjectId = materialInAndOutRecord.ProjectId, + GoodsCategoryId = materialInAndOutRecord.GoodsCategoryId, + GoodsCategoryName = materialInAndOutRecord.GoodsCategoryName, + MaterialModel = materialInAndOutRecord.MaterialModel, + InOutDate = materialInAndOutRecord.InOutDate, + UnitId = materialInAndOutRecord.UnitId, + InOrOut = materialInAndOutRecord.InOrOut, + Number = materialInAndOutRecord.Number, + MaterialUnitId = materialInAndOutRecord.MaterialUnitId, + Remark = materialInAndOutRecord.Remark, + CompileMan = materialInAndOutRecord.CompileMan, + CompileDate = materialInAndOutRecord.CompileDate + }; + db.MaterialInAndOutRecord.InsertOnSubmit(newMaterialInAndOutRecord); + db.SubmitChanges(); + } + + /// + /// 修改物资进出记录 + /// + /// + public static void UpdateMaterialInAndOutRecord(Model.MaterialInAndOutRecord materialInAndOutRecord) + { + Model.SGGLDB db = Funs.DB; + Model.MaterialInAndOutRecord newMaterialInAndOutRecord = + db.MaterialInAndOutRecord.FirstOrDefault(e => e.Id == materialInAndOutRecord.Id); + if (newMaterialInAndOutRecord != null) + { + newMaterialInAndOutRecord.GoodsCategoryId = materialInAndOutRecord.GoodsCategoryId; + newMaterialInAndOutRecord.GoodsCategoryName = materialInAndOutRecord.GoodsCategoryName; + newMaterialInAndOutRecord.MaterialModel = materialInAndOutRecord.MaterialModel; + newMaterialInAndOutRecord.InOutDate = materialInAndOutRecord.InOutDate; + newMaterialInAndOutRecord.UnitId = materialInAndOutRecord.UnitId; + newMaterialInAndOutRecord.InOrOut = materialInAndOutRecord.InOrOut; + newMaterialInAndOutRecord.Number = materialInAndOutRecord.Number; + newMaterialInAndOutRecord.MaterialUnitId = materialInAndOutRecord.MaterialUnitId; + newMaterialInAndOutRecord.Remark = materialInAndOutRecord.Remark; + newMaterialInAndOutRecord.CompileMan = materialInAndOutRecord.CompileMan; + newMaterialInAndOutRecord.CompileDate = materialInAndOutRecord.CompileDate; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除物资进出记录 + /// + /// + public static void DeleteMaterialInAndOutRecordById(string id) + { + Model.SGGLDB db = Funs.DB; + Model.MaterialInAndOutRecord materialInAndOutRecord = + db.MaterialInAndOutRecord.FirstOrDefault(e => e.Id == id); + if (materialInAndOutRecord != null) + { + CodeRecordsService.DeleteCodeRecordsByDataId(id); //删除编号 + CommonService.DeleteAttachFileById(id); //删除附件 + db.MaterialInAndOutRecord.DeleteOnSubmit(materialInAndOutRecord); + db.SubmitChanges(); + } + } + + + /// + /// 取物资进出记录列表 + /// + /// + public static IEnumerable GetMaterialInAndOutRecordList() + { + var result = (from record in Funs.DB.MaterialInAndOutRecord + join materialUnit in Funs.DB.Base_MaterialUnit on record.MaterialUnitId equals materialUnit + .MaterialUnitId into MaterialUnitGroup + from materialUnit in MaterialUnitGroup.DefaultIfEmpty() + join unit in Funs.DB.Base_Unit on record.UnitId equals unit.UnitId into UnitGroup + from unit in UnitGroup.DefaultIfEmpty() + join users in Funs.DB.Sys_User on record.CompileMan equals users.UserId into UsersGroup + from users in UsersGroup.DefaultIfEmpty() + select new + { + record.Id, + record.ProjectId, + record.GoodsCategoryId, + record.GoodsCategoryName, + record.MaterialModel, + record.InOutDate, + record.InOrOut, + record.Number, + record.Remark, + record.UnitId, + record.CompileMan, + record.CompileDate, + record.MaterialUnitId, + MaterialUnitName = materialUnit != null ? materialUnit.MaterialUnitName : null, + UnitName = unit != null ? unit.UnitName : null, + CompileManName = users != null ? users.UserName : null + } + ).OrderByDescending(x => x.InOutDate).ToList(); + + return result; + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx new file mode 100644 index 00000000..3a03c863 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx @@ -0,0 +1,156 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialUnit.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.MaterialUnit" %> + + + + + + 物资单位信息 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.cs new file mode 100644 index 00000000..4523add2 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.cs @@ -0,0 +1,284 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; + +namespace FineUIPro.Web.BaseInfo +{ + public partial class MaterialUnit : PageBase + { + #region 加载页面 + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + ////权限按钮方法 + this.GetButtonPower(); + Funs.DropDownPageSize(this.ddlPageSize); + ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + BindGrid(); + } + } + + /// + /// 绑定数据 + /// + private void BindGrid() + { + var q = from x in Funs.DB.Base_MaterialUnit orderby x.MaterialUnitCode select x; + Grid1.RecordCount = q.Count(); + // 2.获取当前分页数据 + var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); + Grid1.DataSource = table; + Grid1.DataBind(); + } + + /// + /// 分页 + /// + /// + private List GetPagedDataTable(int pageIndex, int pageSize) + { + List source = + (from x in Funs.DB.Base_MaterialUnit orderby x.MaterialUnitCode select x).ToList(); + List paged = new List(); + + int rowbegin = pageIndex * pageSize; + int rowend = (pageIndex + 1) * pageSize; + if (rowend > source.Count()) + { + rowend = source.Count(); + } + + for (int i = rowbegin; i < rowend; i++) + { + paged.Add(source[i]); + } + + return paged; + } + + /// + /// 改变索引事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + + /// + /// 分页下拉选择 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + /// + /// 过滤表头 + /// + /// + /// + protected void Grid1_FilterChange(object sender, EventArgs e) + { + BindGrid(); + } + + #endregion + + #region 删除 + + /// + /// 删除 + /// + /// + /// + protected void btnDelete_Click(object sender, EventArgs e) + { + BLL.LogService.AddSys_Log(this.CurrUser, this.txtMaterialUnitCode.Text, hfFormID.Text, + BLL.Const.MaterialUnitMenuId, BLL.Const.BtnDelete); + BLL.MaterialUnitService.DeleteMaterialUnitById(hfFormID.Text); + + // 重新绑定表格，并模拟点击[新增按钮] + BindGrid(); + PageContext.RegisterStartupScript("onNewButtonClick();"); + } + + /// + /// 右键删除事件 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length > 0) + { + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + + var getV = BLL.MaterialUnitService.GetMaterialUnitById(rowID); + if (getV != null) + { + BLL.LogService.AddSys_Log(this.CurrUser, getV.MaterialUnitCode, getV.MaterialUnitId, + BLL.Const.MaterialUnitMenuId, BLL.Const.BtnDelete); + BLL.MaterialUnitService.DeleteMaterialUnitById(rowID); + } + } + + BindGrid(); + PageContext.RegisterStartupScript("onNewButtonClick();"); + } + } + + #endregion + + #region 编辑 + + /// + /// 右键编辑事件 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！"); + return; + } + + string Id = Grid1.SelectedRowID; + var materialUnit = BLL.MaterialUnitService.GetMaterialUnitById(Id); + if (materialUnit != null) + { + this.txtMaterialUnitCode.Text = materialUnit.MaterialUnitCode; + this.txtMaterialUnitName.Text = materialUnit.MaterialUnitName; + this.txtRemark.Text = materialUnit.Remark; + hfFormID.Text = Id; + this.btnDelete.Enabled = true; + } + } + + #endregion + + #region 保存 + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + string strRowID = hfFormID.Text; + Model.Base_MaterialUnit newMaterialUnit = new Model.Base_MaterialUnit + { + MaterialUnitCode = this.txtMaterialUnitCode.Text.Trim(), + MaterialUnitName = this.txtMaterialUnitName.Text.Trim(), + Remark = txtRemark.Text.Trim() + }; + if (string.IsNullOrEmpty(strRowID)) + { + newMaterialUnit.MaterialUnitId = SQLHelper.GetNewID(typeof(Model.Base_MaterialUnit)); + BLL.MaterialUnitService.AddMaterialUnit(newMaterialUnit); + BLL.LogService.AddSys_Log(this.CurrUser, newMaterialUnit.MaterialUnitCode, + newMaterialUnit.MaterialUnitId, BLL.Const.MaterialUnitMenuId, BLL.Const.BtnAdd); + } + else + { + newMaterialUnit.MaterialUnitId = strRowID; + BLL.MaterialUnitService.UpdateMaterialUnit(newMaterialUnit); + BLL.LogService.AddSys_Log(this.CurrUser, newMaterialUnit.MaterialUnitCode, + newMaterialUnit.MaterialUnitId, BLL.Const.MaterialUnitMenuId, BLL.Const.BtnModify); + } + + this.SimpleForm1.Reset(); + // 重新绑定表格，并点击当前编辑或者新增的行 + BindGrid(); + PageContext.RegisterStartupScript(String.Format("F('{0}').selectRow('{1}');", Grid1.ClientID, + newMaterialUnit.MaterialUnitId)); + } + + #endregion + + #region 验证职称信息名称、编号是否存在 + + /// + /// 验证职称信息名称、编号是否存在 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + var q = Funs.DB.Base_MaterialUnit.FirstOrDefault(x => + x.MaterialUnitCode == this.txtMaterialUnitCode.Text.Trim() && (x.MaterialUnitId != hfFormID.Text || + (hfFormID.Text == null && + x.MaterialUnitId != null))); + if (q != null) + { + ShowNotify("输入的职称编号已存在！", MessageBoxIcon.Warning); + } + + var q2 = Funs.DB.Base_MaterialUnit.FirstOrDefault(x => + x.MaterialUnitName == this.txtMaterialUnitName.Text.Trim() && (x.MaterialUnitId != hfFormID.Text || + (hfFormID.Text == null && + x.MaterialUnitId != null))); + if (q2 != null) + { + ShowNotify("输入的职称名称已存在！", MessageBoxIcon.Warning); + } + } + + #endregion + + #region 获取按钮权限 + + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, + BLL.Const.MaterialUnitMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnAdd)) + { + this.btnNew.Hidden = false; + } + + if (buttonList.Contains(BLL.Const.BtnModify)) + { + this.btnMenuEdit.Hidden = false; + } + + if (buttonList.Contains(BLL.Const.BtnDelete)) + { + this.btnDelete.Hidden = false; + this.btnMenuDelete.Hidden = false; + } + + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.designer.cs new file mode 100644 index 00000000..54c19b78 --- /dev/null +++ b/SGGL/FineUIPro.Web/BaseInfo/MaterialUnit.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.BaseInfo +{ + + + public partial class MaterialUnit + { + + /// + /// 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; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.SimpleForm SimpleForm1; + + /// + /// hfFormID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox hfFormID; + + /// + /// txtMaterialUnitCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialUnitCode; + + /// + /// txtMaterialUnitName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialUnitName; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + + /// + /// btnDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnDelete; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx index 603f8ba4..d41536ed 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx +++ b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx @@ -1,97 +1,98 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RewardAndPunishManager.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.RewardAndPunishManager" %> + + - 奖罚类别维护 - + -
- - - - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.cs index 96212709..081b1f3f 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using BLL; @@ -71,15 +71,15 @@ namespace FineUIPro.Web.BaseInfo private void BindGrid() { var q = from x in Funs.DB.Sys_Const - where x.GroupId == "RewardType" || x.GroupId == "PunishType" - orderby x.SortIndex - select new - { - ID = x.ID, - ConstText = x.ConstText, - Remark = x.Remark, - GroupName = x.GroupId == "RewardType" ? "奖励" : "处罚" - }; + where x.GroupId == "RewardType" || x.GroupId == "PunishType" + orderby x.SortIndex + select new + { + ID = x.ID, + ConstText = x.ConstText, + Remark = x.Remark, + GroupName = x.GroupId == "RewardType" ? "奖励" : "处罚" + }; Grid1.RecordCount = q.Count(); // 2.获取当前分页数据 var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize); @@ -95,15 +95,15 @@ namespace FineUIPro.Web.BaseInfo { var source = (from x in Funs.DB.Sys_Const - where x.GroupId == "RewardType" || x.GroupId == "PunishType" - orderby x.SortIndex - select new - { - ID = x.ID, - ConstText = x.ConstText, - Remark = x.Remark, - GroupName = x.GroupId == "RewardType" ? "奖励" : "处罚" - }).ToList(); + where x.GroupId == "RewardType" || x.GroupId == "PunishType" + orderby x.SortIndex + select new + { + ID = x.ID, + ConstText = x.ConstText, + Remark = x.Remark, + GroupName = x.GroupId == "RewardType" ? "奖励" : "处罚" + }).ToList(); List paged = new List(); @@ -283,14 +283,14 @@ namespace FineUIPro.Web.BaseInfo model.GroupId = "PunishType"; } } - + if (string.IsNullOrEmpty(strRowID)) { model.ID = SQLHelper.GetNewID(typeof(Model.Base_TrainLevel)); model.SortIndex = Funs.DB.Sys_Const.Where(x => x.GroupId == "RewardType" || x.GroupId == "PunishType") .ToList().Count + 1; - + if (!string.IsNullOrEmpty(this.rblIsType.SelectedValue)) { if (this.rblIsType.SelectedValue == "奖励") @@ -304,7 +304,7 @@ namespace FineUIPro.Web.BaseInfo .ToList().Count + 1).ToString(); } } - + Funs.DB.Sys_Const.InsertOnSubmit(model); Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.designer.cs index 43d0046c..d25cfcd6 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/RewardAndPunishManager.aspx.designer.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // <自动生成> // 此代码由工具生成。 // diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 62700bae..46cc4ec8 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -238,6 +238,7 @@ + @@ -6658,6 +6659,13 @@ Certificate.aspx + + MaterialUnit.aspx + ASPXCodeBehind + + + MaterialUnit.aspx + Qualification.aspx ASPXCodeBehind diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index dbe84bd6..f2732b0e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -155,6 +155,9 @@ namespace Model partial void InsertBase_Material(Base_Material instance); partial void UpdateBase_Material(Base_Material instance); partial void DeleteBase_Material(Base_Material instance); + partial void InsertBase_MaterialUnit(Base_MaterialUnit instance); + partial void UpdateBase_MaterialUnit(Base_MaterialUnit instance); + partial void DeleteBase_MaterialUnit(Base_MaterialUnit instance); partial void InsertBase_Medium(Base_Medium instance); partial void UpdateBase_Medium(Base_Medium instance); partial void DeleteBase_Medium(Base_Medium instance); @@ -1712,6 +1715,9 @@ namespace Model partial void InsertManager_TrainSortC(Manager_TrainSortC instance); partial void UpdateManager_TrainSortC(Manager_TrainSortC instance); partial void DeleteManager_TrainSortC(Manager_TrainSortC instance); + partial void InsertMaterialInAndOutRecord(MaterialInAndOutRecord instance); + partial void UpdateMaterialInAndOutRecord(MaterialInAndOutRecord instance); + partial void DeleteMaterialInAndOutRecord(MaterialInAndOutRecord instance); partial void InsertMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void UpdateMeeting_AttendMeeting(Meeting_AttendMeeting instance); partial void DeleteMeeting_AttendMeeting(Meeting_AttendMeeting instance); @@ -3238,6 +3244,14 @@ namespace Model } } + public System.Data.Linq.Table Base_MaterialUnit + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Base_Medium { get @@ -7398,6 +7412,14 @@ namespace Model } } + public System.Data.Linq.Table MaterialInAndOutRecord + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Meeting_AttendMeeting { get @@ -25237,6 +25259,140 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_MaterialUnit")] + public partial class Base_MaterialUnit : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MaterialUnitId; + + private string _MaterialUnitName; + + private string _MaterialUnitCode; + + private string _Remark; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMaterialUnitIdChanging(string value); + partial void OnMaterialUnitIdChanged(); + partial void OnMaterialUnitNameChanging(string value); + partial void OnMaterialUnitNameChanged(); + partial void OnMaterialUnitCodeChanging(string value); + partial void OnMaterialUnitCodeChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + #endregion + + public Base_MaterialUnit() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MaterialUnitId + { + get + { + return this._MaterialUnitId; + } + set + { + if ((this._MaterialUnitId != value)) + { + this.OnMaterialUnitIdChanging(value); + this.SendPropertyChanging(); + this._MaterialUnitId = value; + this.SendPropertyChanged("MaterialUnitId"); + this.OnMaterialUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitName", DbType="NVarChar(100)")] + public string MaterialUnitName + { + get + { + return this._MaterialUnitName; + } + set + { + if ((this._MaterialUnitName != value)) + { + this.OnMaterialUnitNameChanging(value); + this.SendPropertyChanging(); + this._MaterialUnitName = value; + this.SendPropertyChanged("MaterialUnitName"); + this.OnMaterialUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitCode", DbType="NVarChar(50)")] + public string MaterialUnitCode + { + get + { + return this._MaterialUnitCode; + } + set + { + if ((this._MaterialUnitCode != value)) + { + this.OnMaterialUnitCodeChanging(value); + this.SendPropertyChanging(); + this._MaterialUnitCode = value; + this.SendPropertyChanged("MaterialUnitCode"); + this.OnMaterialUnitCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + 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_Medium")] public partial class Base_Medium : INotifyPropertyChanging, INotifyPropertyChanged { @@ -276263,6 +276419,356 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.MaterialInAndOutRecord")] + public partial class MaterialInAndOutRecord : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ProjectId; + + private string _GoodsCategoryId; + + private string _GoodsCategoryName; + + private string _MaterialModel; + + private System.Nullable _InOutDate; + + private string _UnitId; + + private string _InOrOut; + + private System.Nullable _Number; + + private string _MaterialUnitId; + + private string _Remark; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnGoodsCategoryIdChanging(string value); + partial void OnGoodsCategoryIdChanged(); + partial void OnGoodsCategoryNameChanging(string value); + partial void OnGoodsCategoryNameChanged(); + partial void OnMaterialModelChanging(string value); + partial void OnMaterialModelChanged(); + partial void OnInOutDateChanging(System.Nullable value); + partial void OnInOutDateChanged(); + partial void OnUnitIdChanging(string value); + partial void OnUnitIdChanged(); + partial void OnInOrOutChanging(string value); + partial void OnInOrOutChanged(); + partial void OnNumberChanging(System.Nullable value); + partial void OnNumberChanged(); + partial void OnMaterialUnitIdChanging(string value); + partial void OnMaterialUnitIdChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + #endregion + + public MaterialInAndOutRecord() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GoodsCategoryId", DbType="NVarChar(50)")] + public string GoodsCategoryId + { + get + { + return this._GoodsCategoryId; + } + set + { + if ((this._GoodsCategoryId != value)) + { + this.OnGoodsCategoryIdChanging(value); + this.SendPropertyChanging(); + this._GoodsCategoryId = value; + this.SendPropertyChanged("GoodsCategoryId"); + this.OnGoodsCategoryIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GoodsCategoryName", DbType="NVarChar(100)")] + public string GoodsCategoryName + { + get + { + return this._GoodsCategoryName; + } + set + { + if ((this._GoodsCategoryName != value)) + { + this.OnGoodsCategoryNameChanging(value); + this.SendPropertyChanging(); + this._GoodsCategoryName = value; + this.SendPropertyChanged("GoodsCategoryName"); + this.OnGoodsCategoryNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialModel", DbType="NVarChar(100)")] + public string MaterialModel + { + get + { + return this._MaterialModel; + } + set + { + if ((this._MaterialModel != value)) + { + this.OnMaterialModelChanging(value); + this.SendPropertyChanging(); + this._MaterialModel = value; + this.SendPropertyChanged("MaterialModel"); + this.OnMaterialModelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOutDate", DbType="DateTime")] + public System.Nullable InOutDate + { + get + { + return this._InOutDate; + } + set + { + if ((this._InOutDate != value)) + { + this.OnInOutDateChanging(value); + this.SendPropertyChanging(); + this._InOutDate = value; + this.SendPropertyChanged("InOutDate"); + this.OnInOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")] + public string UnitId + { + get + { + return this._UnitId; + } + set + { + if ((this._UnitId != value)) + { + this.OnUnitIdChanging(value); + this.SendPropertyChanging(); + this._UnitId = value; + this.SendPropertyChanged("UnitId"); + this.OnUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InOrOut", DbType="NVarChar(10)")] + public string InOrOut + { + get + { + return this._InOrOut; + } + set + { + if ((this._InOrOut != value)) + { + this.OnInOrOutChanging(value); + this.SendPropertyChanging(); + this._InOrOut = value; + this.SendPropertyChanged("InOrOut"); + this.OnInOrOutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="Decimal(18,2)")] + public System.Nullable Number + { + get + { + return this._Number; + } + set + { + if ((this._Number != value)) + { + this.OnNumberChanging(value); + this.SendPropertyChanging(); + this._Number = value; + this.SendPropertyChanged("Number"); + this.OnNumberChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnitId", DbType="NVarChar(50)")] + public string MaterialUnitId + { + get + { + return this._MaterialUnitId; + } + set + { + if ((this._MaterialUnitId != value)) + { + this.OnMaterialUnitIdChanging(value); + this.SendPropertyChanging(); + this._MaterialUnitId = value; + this.SendPropertyChanged("MaterialUnitId"); + this.OnMaterialUnitIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + 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.Meeting_AttendMeeting")] public partial class Meeting_AttendMeeting : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 12605e71..259b1ecd 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>G:\发布\五环WebApi - True|2026-03-20T08:59:16.0930705Z||;True|2026-03-11T19:40:09.7470523+08:00||;True|2026-03-11T17:57:46.6298303+08:00||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||; + True|2026-03-20T11:19:26.8552857Z||;True|2026-03-20T16:59:16.0930705+08:00||;True|2026-03-11T19:40:09.7470523+08:00||;True|2026-03-11T17:57:46.6298303+08:00||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 03/20/2026 16:59:13 + 03/20/2026 19:19:25 - 03/20/2026 16:59:13 + 03/20/2026 19:19:25 12/06/2024 20:13:58 - 03/20/2026 16:58:51 + 03/20/2026 19:19:14 12/26/2024 09:46:52 - 03/20/2026 16:58:51 + 03/20/2026 19:19:14 12/18/2020 05:32:28 @@ -128,10 +128,10 @@ 07/25/2012 19:48:56 - 03/20/2026 16:58:45 + 03/20/2026 19:19:09 - 03/20/2026 16:58:45 + 03/20/2026 19:19:09 03/16/2026 20:22:47 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 03/20/2026 16:58:53 + 03/20/2026 19:19:15 - 03/20/2026 16:58:53 + 03/20/2026 19:19:15 - 03/20/2026 16:58:52 + 03/20/2026 19:19:15 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 03/20/2026 16:58:54 + 03/20/2026 19:19:16 10/28/2024 14:02:50 diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 1689bc0c..12af578b 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Debug|Any CPU + Release|Any CPU true