From 0f566a692a56550a5a8e01d2798f534382490ce3 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 20 Jul 2026 15:12:51 +0800 Subject: [PATCH] =?UTF-8?q?20260720=20=E9=A2=86=E6=96=99=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=8A=A0=E8=BD=BD=E4=B8=8A?= =?UTF-8?q?=E6=AC=A1=E4=BF=9D=E5=AD=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-07-20_bwj.sql | 150 ++++ HJGL_DS/BLL/BLL.csproj | 1 + .../WeldMat/UsingPlan/UsingPlanTempService.cs | 104 +++ .../HotProessManage/HotProessTrust.aspx.cs | 23 +- .../WeldMat/UsingPlan/UsingPlanEdit.aspx | 3 + .../WeldMat/UsingPlan/UsingPlanEdit.aspx.cs | 199 ++++- .../UsingPlan/UsingPlanEdit.aspx.designer.cs | 81 +- HJGL_DS/Model/Model.cs | 742 ++++++++++++++++++ 8 files changed, 1254 insertions(+), 49 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-07-20_bwj.sql create mode 100644 HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanTempService.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2026-07-20_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-07-20_bwj.sql new file mode 100644 index 0000000..3b98032 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-07-20_bwj.sql @@ -0,0 +1,150 @@ +UPDATE t1 +SET t1.ProessTypes = t2.ProessTypes +FROM [dbo].[HJGL_CH_HotProessTrustItem] t1 +INNER JOIN [dbo].[HJGL_PW_JointInfo] t2 + ON (t1.JOT_ID = t2.JOT_ID and t1.ProessTypes <> t2.ProessTypes) + go + +ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem] +( + @HotProessTrustId nvarchar(50), + @ProessTypes nvarchar(50)=null +) +AS +--ͨidȡίеϢ +BEGIN +SELECT + HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,Sort1,Sort2,Sort3,Sort4,Sort5,ProessTypes + --STUFF( + -- ( + -- SELECT '+' + CASE + -- WHEN t.ProessTypes = '1' THEN 'Ԥ' + -- WHEN t.ProessTypes = '2' THEN '' + -- WHEN t.ProessTypes = '3' THEN '' + -- WHEN t.ProessTypes = '4' THEN 'Ӧȴ' + -- WHEN t.ProessTypes = '5' THEN 'ȶ' + -- ELSE '' + -- END + -- FROM HJGL_View_CH_HotProessTrustItem t + -- WHERE + -- t.HotProessTrustId = TrustItem.HotProessTrustId + -- AND t.ISO_IsoNo = TrustItem.ISO_IsoNo + -- AND t.JOT_JointNo = TrustItem.JOT_JointNo + -- AND t.JOT_JointDesc = TrustItem.JOT_JointDesc + -- AND t.STE_Code = TrustItem.STE_Code + -- AND t.Sort1 = TrustItem.Sort1 + -- AND t.Sort2 = TrustItem.Sort2 + -- AND t.Sort3 = TrustItem.Sort3 + -- AND t.Sort4 = TrustItem.Sort4 + -- AND t.Sort5 = TrustItem.Sort5 + -- ORDER BY t.ProessTypes -- ProessTypes ƴ + -- FOR XML PATH(''), TYPE + -- ).value('.', 'NVARCHAR(MAX)'), + -- 1, 1, '' -- ȥͷ '+' + --) AS ProessTypes +FROM HJGL_View_CH_HotProessTrustItem TrustItem +WHERE + HotProessTrustId=@HotProessTrustId + and (ProessTypes like '%'+@ProessTypes+'%' or @ProessTypes is null) +GROUP BY + HotProessTrustId,ISO_IsoNo,JOT_JointNo,JOT_JointDesc,STE_Code,Sort1,Sort2,Sort3,Sort4,Sort5,ProessTypes + +union + +select '99999999' as Number,'¿հ' AS ISO_IsoNo,null,null,null,null,null,null,null,null,null + + +ORDER BY ISO_IsoNo,JOT_JointNo,Sort1,Sort2,Sort3,Sort4,Sort5,ProessTypes +end +GO + +CREATE TABLE [dbo].[Weld_UsingPlan_Temp]( + [UsingPlanTempId] [nvarchar](50) NOT NULL, + [WeldId] [nvarchar](50) NULL, + [ProjectId] [nvarchar](50) NULL, + [Jot_ID] [nvarchar](50) NULL, + [Amount] [decimal](9, 3) NULL, + [UsingManOne] [nvarchar](50) NULL, + [UsingManTwo] [nvarchar](50) NULL, + [InPutDate] [datetime] NULL, + [CancelDate] [datetime] NULL, + [IsCancel] [bit] NULL, + [IsFinish] [bit] NULL, + [FinishMan] [nvarchar](50) NULL, + [OrderTime] [nvarchar](50) NULL, + [OrderDate] [datetime] NULL, + [CancelResult] [nvarchar](100) NULL, + [IsSubmit] [bit] NULL, + [UsePosition] [nvarchar](50) NULL, + [UsingUnit] [nvarchar](50) NULL, + [TeamGroupId] [nvarchar](50) NULL, + [STE_ID] [nvarchar](500) NULL, + [STE_Name] [nvarchar](500) NULL, + [IsNeedConfirm] [bit] NULL, + [InPutMan] [nvarchar](50) NULL, + [IsSteelStru] [bit] NULL, + [Type] [char](1) NULL, + [UnitStoreId] [nvarchar](50) NULL, + CONSTRAINT [PK_Weld_UsingPlan_Temp] PRIMARY KEY CLUSTERED +( + [UsingPlanTempId] 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] +GO + +ALTER TABLE [dbo].[Weld_UsingPlan_Temp] WITH CHECK ADD CONSTRAINT [FK_Weld_UsingPlan_Temp_Weld_WeldInfo] FOREIGN KEY([WeldId]) +REFERENCES [dbo].[Weld_WeldInfo] ([WeldId]) +GO + +ALTER TABLE [dbo].[Weld_UsingPlan_Temp] CHECK CONSTRAINT [FK_Weld_UsingPlan_Temp_Weld_WeldInfo] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'UsingPlanTempId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'WeldId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'Jot_ID' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'Amount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'һ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'UsingManOne' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڶ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'UsingManTwo' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¼ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'InPutDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'CancelDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'IsCancel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ָԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'FinishMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԤԼʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'OrderTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԤԼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'OrderDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'CancelResult' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿύ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp', @level2type=N'COLUMN',@level2name=N'IsSubmit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϼƻ¼ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_UsingPlan_Temp' +GO + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 54be333..499139d 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -330,6 +330,7 @@ + diff --git a/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanTempService.cs b/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanTempService.cs new file mode 100644 index 0000000..4abd0e3 --- /dev/null +++ b/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanTempService.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 领料计划临时表 + /// + public class UsingPlanTempService + { + public static Model.Weld_UsingPlan_Temp GetUsingPlanTempByUserId(string inputMan) + { + return Funs.DB.Weld_UsingPlan_Temp.FirstOrDefault(e => e.InPutMan== inputMan); + } + + /// + /// 增加领料计划 + /// + /// + public static void AddUsingPlan(Model.Weld_UsingPlan_Temp usingPlan) + { + Model.SGGLDB db = Funs.DB; + Model.Weld_UsingPlan_Temp newUsingPlan = new Model.Weld_UsingPlan_Temp(); + newUsingPlan.UsingPlanTempId = usingPlan.UsingPlanTempId; + newUsingPlan.WeldId = usingPlan.WeldId; + newUsingPlan.ProjectId = usingPlan.ProjectId; + newUsingPlan.UsePosition = usingPlan.UsePosition; + newUsingPlan.TeamGroupId = usingPlan.TeamGroupId; + newUsingPlan.STE_ID = usingPlan.STE_ID; + newUsingPlan.STE_Name = usingPlan.STE_Name; + newUsingPlan.Amount = usingPlan.Amount; + newUsingPlan.UsingUnit = usingPlan.UsingUnit; + newUsingPlan.UsingManOne = usingPlan.UsingManOne; + newUsingPlan.UsingManTwo = usingPlan.UsingManTwo; + newUsingPlan.InPutDate = usingPlan.InPutDate; + newUsingPlan.OrderDate = usingPlan.OrderDate; + newUsingPlan.OrderTime = usingPlan.OrderTime; + newUsingPlan.CancelDate = usingPlan.CancelDate; + newUsingPlan.IsCancel = usingPlan.IsCancel; + newUsingPlan.CancelResult = usingPlan.CancelResult; + newUsingPlan.IsSubmit = usingPlan.IsSubmit; + newUsingPlan.InPutMan = usingPlan.InPutMan; + newUsingPlan.IsSteelStru = usingPlan.IsSteelStru; + newUsingPlan.Type = usingPlan.Type; + newUsingPlan.UnitStoreId = usingPlan.UnitStoreId; + + db.Weld_UsingPlan_Temp.InsertOnSubmit(newUsingPlan); + db.SubmitChanges(); + } + + /// + /// 修改领料计划 + /// + /// + public static void UpdateUsingPlan(Model.Weld_UsingPlan_Temp usingPlan) + { + Model.SGGLDB db = Funs.DB; + Model.Weld_UsingPlan_Temp newUsingPlan = db.Weld_UsingPlan_Temp.FirstOrDefault(e => e.UsingPlanTempId == usingPlan.UsingPlanTempId); + if (newUsingPlan != null) + { + newUsingPlan.WeldId = usingPlan.WeldId; + newUsingPlan.ProjectId = usingPlan.ProjectId; + newUsingPlan.UsePosition = usingPlan.UsePosition; + newUsingPlan.TeamGroupId = usingPlan.TeamGroupId; + newUsingPlan.STE_ID = usingPlan.STE_ID; + newUsingPlan.STE_Name = usingPlan.STE_Name; + newUsingPlan.Amount = usingPlan.Amount; + newUsingPlan.UsingManOne = usingPlan.UsingManOne; + newUsingPlan.UsingManTwo = usingPlan.UsingManTwo; + newUsingPlan.UsingUnit = usingPlan.UsingUnit; + newUsingPlan.InPutDate = usingPlan.InPutDate; + newUsingPlan.OrderDate = usingPlan.OrderDate; + newUsingPlan.OrderTime = usingPlan.OrderTime; + newUsingPlan.CancelDate = usingPlan.CancelDate; + newUsingPlan.IsCancel = usingPlan.IsCancel; + newUsingPlan.CancelResult = usingPlan.CancelResult; + newUsingPlan.IsSubmit = usingPlan.IsSubmit; + newUsingPlan.InPutMan = usingPlan.InPutMan; + newUsingPlan.IsSteelStru = usingPlan.IsSteelStru; + newUsingPlan.UnitStoreId = usingPlan.UnitStoreId; + + db.SubmitChanges(); + } + } + + /// + /// 根据用户id删除相关临时表 + /// + /// + /// + public static void DeleteUsingPlanTempByUserId(string inputMan) + { + var q = (from x in Funs.DB.Weld_UsingPlan_Temp where x.InPutMan== inputMan select x).ToList(); + if (q.Count > 0) + { + Funs.DB.Weld_UsingPlan_Temp.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs index 153ea48..99c6333 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs @@ -86,17 +86,16 @@ namespace FineUIPro.Web.HJGL.HotProessManage var joints = allJoints.Where(x => x.ISO_ID == item.ISO_ID); foreach (var joint in joints) { - if (!string.IsNullOrEmpty(joint.ProessTypes)) - { - string[] proessTypes = joint.ProessTypes.Split('|'); - for (int i = 0; i < proessTypes.Length; i++) - { - + //if (!string.IsNullOrEmpty(joint.ProessTypes)) + //{ + //string[] proessTypes = joint.ProessTypes.Split('|'); + //for (int i = 0; i < proessTypes.Length; i++) + //{ Model.HJGL_CH_HotProessTrustItem newItem = new Model.HJGL_CH_HotProessTrustItem(); newItem.HotProessTrustId = HotProessTrustId; newItem.ISO_ID = joint.ISO_ID; newItem.JOT_ID = joint.JOT_ID; - newItem.ProessTypes = proessTypes[i]; + newItem.ProessTypes = joint.ProessTypes;//proessTypes[i]; newItem.TrustDate = DateTime.Now; newItem.Remark = string.Empty; newItem.HotProessTrustItemId = SQLHelper.GetNewID(typeof(Model.HJGL_CH_HotProessTrustItem)); @@ -108,8 +107,8 @@ namespace FineUIPro.Web.HJGL.HotProessManage hotProessResult.ProessTypes = newItem.ProessTypes; hotProessResult.HotProessResultId = SQLHelper.GetNewID(typeof(Model.HJGL_CH_HotProessResult)); hotProessResults.Add(hotProessResult); - } - } + //} + //} } } db.HJGL_CH_HotProessTrust.InsertAllOnSubmit(trusts); @@ -508,8 +507,8 @@ namespace FineUIPro.Web.HJGL.HotProessManage } if (this.drpProessTypes.SelectedValue != BLL.Const._Null) { - strSql += @" and Trust.ProessTypes=@ProessTypes "; - listStr.Add(new SqlParameter("@ProessTypes", this.drpProessTypes.SelectedValue)); + strSql += @" and Trust.ProessTypes like @ProessTypes "; + listStr.Add(new SqlParameter("@ProessTypes", "%" + this.drpProessTypes.SelectedValue + "%")); } if (!string.IsNullOrEmpty(this.txtIsoNo.Text.Trim())) { @@ -878,7 +877,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage newRows["JOT_JointNo"] = row["JOT_JointNo"].ToString(); newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["STE_Code"] = row["STE_Code"].ToString(); - newRows["ProessTypes"] = row["ProessTypes"].ToString(); + newRows["ProessTypes"] = ConvertProessTypes(row["ProessTypes"].ToString()); dt2.Rows.Add(newRows); i++; } diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx index 88b84e0..62ec827 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx @@ -127,6 +127,9 @@ + + diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs index 4887ef8..2b57ac5 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs @@ -200,11 +200,142 @@ namespace FineUIPro.Web.WeldMat.UsingPlan } else { - this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + initText(); + //this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + //this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); } } } + + /// + /// 默认加载当前登录人上次保存的数据记录 + /// + /// + private void initText() + { + var temp = BLL.UsingPlanTempService.GetUsingPlanTempByUserId(this.CurrUser.UserId); + if (temp != null) + { + if (!string.IsNullOrEmpty(temp.WeldId)) + { + this.hdWeldId.Text = temp.WeldId; + if (!string.IsNullOrEmpty(temp.UnitStoreId)) + { + this.drpUnitStore.SelectedValue = temp.UnitStoreId; + } + var weld = BLL.WeldInfoService.GetWeldInfoById(temp.WeldId); + if (weld != null) + { + this.txtWeldName.Text = weld.WeldName; + this.txtWeldSpec.Text = weld.WeldSpec; + txtWeldCode.Text = weld.WeldCode; + if (!string.IsNullOrEmpty(weld.WeldTypeId)) + { + var weldType = BLL.WeldTypeService.GetWeldTypeById(weld.WeldTypeId); + if (weldType != null) + { + if (weldType.WeldTypeName == "焊条" || weldType.WeldTypeName == "焊丝") + { + this.txtAmount.Label = "数量(根)"; + } + else + { + this.txtAmount.Label = "数量(Kg)"; + } + } + } + } + if (!string.IsNullOrEmpty(temp.ProjectId)) + { + this.drpProjectId.SelectedValue = temp.ProjectId; + var position = from x in Funs.DB.View_UsePosition + where x.ProjectId == temp.ProjectId + select x; + if (position.Count() > 0) + { + this.drpUsePosition.Items.Clear(); + this.drpUsePosition.DataValueField = "UsePosition"; + this.drpUsePosition.DataTextField = "UsePosition"; + this.drpUsePosition.DataSource = position; + this.drpUsePosition.DataBind(); + Funs.FineUIPleaseSelect(this.drpUsePosition); + if (!string.IsNullOrEmpty(temp.UsePosition)) + { + this.drpUsePosition.SelectedValue = temp.UsePosition; + } + } + else + { + this.drpUsePosition.Items.Clear(); + Funs.FineUIPleaseSelect(this.drpUsePosition); + } + + if (!string.IsNullOrEmpty(temp.UsingUnit)) + { + this.drpUsingUnit.SelectedValue = temp.UsingUnit; + } + + if (!string.IsNullOrEmpty(temp.TeamGroupId)) + { + this.drpTeamGroup.SelectedValue = temp.TeamGroupId; + } + } + + if (temp.Amount.HasValue) + { + this.txtAmount.Text = temp.Amount.ToString(); + } + if (temp.InPutDate.HasValue) + { + this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", temp.InPutDate); + } + if (temp.OrderDate.HasValue) + { + this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", temp.OrderDate); + } + + if (!string.IsNullOrEmpty(temp.OrderTime)) + { + this.drpOrderTime.SelectedValue = temp.OrderTime; + } + + if (temp.CancelDate.HasValue) + { + this.txtCancelDate.Text = string.Format("{0:yyyy-MM-dd}", temp.CancelDate); + } + if (temp.IsSteelStru == true) + { + drpIsSteelStru.SelectedValue = "1"; + } + else + { + drpIsSteelStru.SelectedValue = "0"; + } + + txtCancelResult.Text = temp.CancelResult; + this.rblIsCancel.SelectedValue = (temp.IsCancel == true ? "true" : "false"); + if (!string.IsNullOrEmpty(temp.UsingManOne)) + { + this.hdUsingMan1.Text = temp.UsingManOne; + var welder = BLL.HJGL_PersonManageService.GetWelderByWenId(temp.UsingManOne); + if (welder != null) + { + this.txtUsingManOne.Text = welder.WED_Name; + } + } + + if (!string.IsNullOrEmpty(temp.STE_ID)) + { + drpSheet.SelectedValueArray = temp.STE_ID.Split(','); + } + } + } + else + { + this.txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + this.txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + } #endregion #region 保存 @@ -490,6 +621,33 @@ namespace FineUIPro.Web.WeldMat.UsingPlan // } //} #endregion + + #region 添加到临时表，以供下次登录时加载当前登录人保存的记录数据 + BLL.UsingPlanTempService.DeleteUsingPlanTempByUserId(this.CurrUser.UserId); + Model.Weld_UsingPlan_Temp newTemp = new Model.Weld_UsingPlan_Temp(); + newTemp.UsingPlanTempId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan_Temp)); + newTemp.UnitStoreId = usingPlan.UnitStoreId; + newTemp.WeldId = usingPlan.WeldId; + newTemp.ProjectId = usingPlan.ProjectId; + newTemp.UsePosition = usingPlan.UsePosition; + newTemp.UsingUnit = usingPlan.UsingUnit; + newTemp.STE_ID = usingPlan.STE_ID; + newTemp.STE_Name = usingPlan.STE_Name; + newTemp.Amount = usingPlan.Amount; + newTemp.UsingManOne = usingPlan.UsingManOne; + newTemp.InPutDate = DateTime.Now; + newTemp.OrderDate = DateTime.Now; + newTemp.OrderTime = usingPlan.OrderTime; + newTemp.TeamGroupId = usingPlan.TeamGroupId; + newTemp.CancelDate = usingPlan.CancelDate; + newTemp.IsCancel = usingPlan.IsCancel; + newTemp.CancelResult = usingPlan.CancelResult; + newTemp.IsSubmit= usingPlan.IsSubmit; + newTemp.InPutMan = CurrUser.UserId; + newTemp.Type = "1"; + newTemp.IsSteelStru = usingPlan.IsSteelStru; + BLL.UsingPlanTempService.AddUsingPlan(newTemp); + #endregion if (isSubmit == true) { ShowNotify("提交成功！", MessageBoxIcon.Success); @@ -801,5 +959,42 @@ namespace FineUIPro.Web.WeldMat.UsingPlan // } //} #endregion + + /// + /// 清空文本框内容 + /// + /// + /// + protected void btnClear_Click(object sender, EventArgs e) + { + drpProjectId.SelectedValue = BLL.Const._Null; + drpUnitStore.SelectedValue = BLL.Const._Null; + txtWeldName.Text = string.Empty; + txtWeldSpec.Text = string.Empty; + txtWeldCode.Text = string.Empty; + + var unit = BLL.Base_UnitService.GetAllUnitList(); + this.drpUsingUnit.Items.Clear(); + this.drpUsingUnit.DataValueField = "UnitId"; + this.drpUsingUnit.DataTextField = "UnitName"; + this.drpUsingUnit.DataSource = unit; + this.drpUsingUnit.DataBind(); + Funs.FineUIPleaseSelect(this.drpUsingUnit); + this.drpUsingUnit.SelectedValue = this.CurrUser.UnitId; + + this.drpUsePosition.Items.Clear(); + Funs.FineUIPleaseSelect(this.drpUsePosition); + drpIsSteelStru.SelectedValue = "1"; + txtUsingManOne.Text = string.Empty; + drpTeamGroup.SelectedValue = BLL.Const._Null; + txtAmount.Text = string.Empty; + txtInPutDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + txtOrderDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + drpOrderTime.SelectedValue = BLL.Const._Null; + drpSheet.SelectedValue = BLL.Const._Null; + rblIsCancel.SelectedValue = "false"; + txtCancelDate.Text = string.Empty; + txtCancelResult.Text = string.Empty; + } } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs index 8604dd0..4f6c62d 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WeldMat.UsingPlan { - - - public partial class UsingPlanEdit { - +namespace FineUIPro.Web.WeldMat.UsingPlan +{ + + + public partial class UsingPlanEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Form2 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form2; - + /// /// hdWeldId 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdWeldId; - + /// /// hdUsingMan1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdUsingMan1; - + /// /// drpProjectId 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProjectId; - + /// /// drpUnitStore 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitStore; - + /// /// txtWeldName 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldName; - + /// /// btnSelect 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSelect; - + /// /// txtWeldSpec 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldSpec; - + /// /// txtWeldCode 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldCode; - + /// /// drpUsingUnit 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUsingUnit; - + /// /// drpUsePosition 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUsePosition; - + /// /// drpIsSteelStru 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpIsSteelStru; - + /// /// txtUsingManOne 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUsingManOne; - + /// /// btnSelectUsingMan 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSelectUsingMan; - + /// /// drpTeamGroup 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpTeamGroup; - + /// /// txtAmount 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtAmount; - + /// /// txtInPutDate 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtInPutDate; - + /// /// txtOrderDate 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtOrderDate; - + /// /// drpOrderTime 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpOrderTime; - + /// /// drpSheet 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSheet; - + /// /// rblIsCancel 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsCancel; - + /// /// txtCancelDate 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCancelDate; - + /// /// txtCancelResult 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCancelResult; - + /// /// Toolbar2 控件。 /// @@ -245,7 +247,16 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + + /// + /// btnClear 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClear; + /// /// btnSave 控件。 /// @@ -254,7 +265,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -263,7 +274,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// btnClose 控件。 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// Window1 控件。 /// @@ -281,7 +292,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index fd71783..376f631 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -704,6 +704,9 @@ namespace Model partial void InsertWeld_UsingPlan(Weld_UsingPlan instance); partial void UpdateWeld_UsingPlan(Weld_UsingPlan instance); partial void DeleteWeld_UsingPlan(Weld_UsingPlan instance); + partial void InsertWeld_UsingPlan_Temp(Weld_UsingPlan_Temp instance); + partial void UpdateWeld_UsingPlan_Temp(Weld_UsingPlan_Temp instance); + partial void DeleteWeld_UsingPlan_Temp(Weld_UsingPlan_Temp instance); partial void InsertWeld_WeldInfo(Weld_WeldInfo instance); partial void UpdateWeld_WeldInfo(Weld_WeldInfo instance); partial void DeleteWeld_WeldInfo(Weld_WeldInfo instance); @@ -3059,6 +3062,14 @@ namespace Model } } + public System.Data.Linq.Table Weld_UsingPlan_Temp + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Weld_View_ReleaseRecovery { get @@ -141539,6 +141550,709 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_UsingPlan_Temp")] + public partial class Weld_UsingPlan_Temp : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _UsingPlanTempId; + + private string _WeldId; + + private string _ProjectId; + + private string _Jot_ID; + + private System.Nullable _Amount; + + private string _UsingManOne; + + private string _UsingManTwo; + + private System.Nullable _InPutDate; + + private System.Nullable _CancelDate; + + private System.Nullable _IsCancel; + + private System.Nullable _IsFinish; + + private string _FinishMan; + + private string _OrderTime; + + private System.Nullable _OrderDate; + + private string _CancelResult; + + private System.Nullable _IsSubmit; + + private string _UsePosition; + + private string _UsingUnit; + + private string _TeamGroupId; + + private string _STE_ID; + + private string _STE_Name; + + private System.Nullable _IsNeedConfirm; + + private string _InPutMan; + + private System.Nullable _IsSteelStru; + + private string _Type; + + private string _UnitStoreId; + + private EntityRef _Weld_WeldInfo; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnUsingPlanTempIdChanging(string value); + partial void OnUsingPlanTempIdChanged(); + partial void OnWeldIdChanging(string value); + partial void OnWeldIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnJot_IDChanging(string value); + partial void OnJot_IDChanged(); + partial void OnAmountChanging(System.Nullable value); + partial void OnAmountChanged(); + partial void OnUsingManOneChanging(string value); + partial void OnUsingManOneChanged(); + partial void OnUsingManTwoChanging(string value); + partial void OnUsingManTwoChanged(); + partial void OnInPutDateChanging(System.Nullable value); + partial void OnInPutDateChanged(); + partial void OnCancelDateChanging(System.Nullable value); + partial void OnCancelDateChanged(); + partial void OnIsCancelChanging(System.Nullable value); + partial void OnIsCancelChanged(); + partial void OnIsFinishChanging(System.Nullable value); + partial void OnIsFinishChanged(); + partial void OnFinishManChanging(string value); + partial void OnFinishManChanged(); + partial void OnOrderTimeChanging(string value); + partial void OnOrderTimeChanged(); + partial void OnOrderDateChanging(System.Nullable value); + partial void OnOrderDateChanged(); + partial void OnCancelResultChanging(string value); + partial void OnCancelResultChanged(); + partial void OnIsSubmitChanging(System.Nullable value); + partial void OnIsSubmitChanged(); + partial void OnUsePositionChanging(string value); + partial void OnUsePositionChanged(); + partial void OnUsingUnitChanging(string value); + partial void OnUsingUnitChanged(); + partial void OnTeamGroupIdChanging(string value); + partial void OnTeamGroupIdChanged(); + partial void OnSTE_IDChanging(string value); + partial void OnSTE_IDChanged(); + partial void OnSTE_NameChanging(string value); + partial void OnSTE_NameChanged(); + partial void OnIsNeedConfirmChanging(System.Nullable value); + partial void OnIsNeedConfirmChanged(); + partial void OnInPutManChanging(string value); + partial void OnInPutManChanged(); + partial void OnIsSteelStruChanging(System.Nullable value); + partial void OnIsSteelStruChanged(); + partial void OnTypeChanging(string value); + partial void OnTypeChanged(); + partial void OnUnitStoreIdChanging(string value); + partial void OnUnitStoreIdChanged(); + #endregion + + public Weld_UsingPlan_Temp() + { + this._Weld_WeldInfo = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UsingPlanTempId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string UsingPlanTempId + { + get + { + return this._UsingPlanTempId; + } + set + { + if ((this._UsingPlanTempId != value)) + { + this.OnUsingPlanTempIdChanging(value); + this.SendPropertyChanging(); + this._UsingPlanTempId = value; + this.SendPropertyChanged("UsingPlanTempId"); + this.OnUsingPlanTempIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldId", DbType="NVarChar(50)")] + public string WeldId + { + get + { + return this._WeldId; + } + set + { + if ((this._WeldId != value)) + { + if (this._Weld_WeldInfo.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnWeldIdChanging(value); + this.SendPropertyChanging(); + this._WeldId = value; + this.SendPropertyChanged("WeldId"); + this.OnWeldIdChanged(); + } + } + } + + [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="_Jot_ID", DbType="NVarChar(50)")] + public string Jot_ID + { + get + { + return this._Jot_ID; + } + set + { + if ((this._Jot_ID != value)) + { + this.OnJot_IDChanging(value); + this.SendPropertyChanging(); + this._Jot_ID = value; + this.SendPropertyChanged("Jot_ID"); + this.OnJot_IDChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Amount", DbType="Decimal(9,3)")] + public System.Nullable Amount + { + get + { + return this._Amount; + } + set + { + if ((this._Amount != value)) + { + this.OnAmountChanging(value); + this.SendPropertyChanging(); + this._Amount = value; + this.SendPropertyChanged("Amount"); + this.OnAmountChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UsingManOne", DbType="NVarChar(50)")] + public string UsingManOne + { + get + { + return this._UsingManOne; + } + set + { + if ((this._UsingManOne != value)) + { + this.OnUsingManOneChanging(value); + this.SendPropertyChanging(); + this._UsingManOne = value; + this.SendPropertyChanged("UsingManOne"); + this.OnUsingManOneChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UsingManTwo", DbType="NVarChar(50)")] + public string UsingManTwo + { + get + { + return this._UsingManTwo; + } + set + { + if ((this._UsingManTwo != value)) + { + this.OnUsingManTwoChanging(value); + this.SendPropertyChanging(); + this._UsingManTwo = value; + this.SendPropertyChanged("UsingManTwo"); + this.OnUsingManTwoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InPutDate", DbType="DateTime")] + public System.Nullable InPutDate + { + get + { + return this._InPutDate; + } + set + { + if ((this._InPutDate != value)) + { + this.OnInPutDateChanging(value); + this.SendPropertyChanging(); + this._InPutDate = value; + this.SendPropertyChanged("InPutDate"); + this.OnInPutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CancelDate", DbType="DateTime")] + public System.Nullable CancelDate + { + get + { + return this._CancelDate; + } + set + { + if ((this._CancelDate != value)) + { + this.OnCancelDateChanging(value); + this.SendPropertyChanging(); + this._CancelDate = value; + this.SendPropertyChanged("CancelDate"); + this.OnCancelDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCancel", DbType="Bit")] + public System.Nullable IsCancel + { + get + { + return this._IsCancel; + } + set + { + if ((this._IsCancel != value)) + { + this.OnIsCancelChanging(value); + this.SendPropertyChanging(); + this._IsCancel = value; + this.SendPropertyChanged("IsCancel"); + this.OnIsCancelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsFinish", DbType="Bit")] + public System.Nullable IsFinish + { + get + { + return this._IsFinish; + } + set + { + if ((this._IsFinish != value)) + { + this.OnIsFinishChanging(value); + this.SendPropertyChanging(); + this._IsFinish = value; + this.SendPropertyChanged("IsFinish"); + this.OnIsFinishChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FinishMan", DbType="NVarChar(50)")] + public string FinishMan + { + get + { + return this._FinishMan; + } + set + { + if ((this._FinishMan != value)) + { + this.OnFinishManChanging(value); + this.SendPropertyChanging(); + this._FinishMan = value; + this.SendPropertyChanged("FinishMan"); + this.OnFinishManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderTime", DbType="NVarChar(50)")] + public string OrderTime + { + get + { + return this._OrderTime; + } + set + { + if ((this._OrderTime != value)) + { + this.OnOrderTimeChanging(value); + this.SendPropertyChanging(); + this._OrderTime = value; + this.SendPropertyChanged("OrderTime"); + this.OnOrderTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderDate", DbType="DateTime")] + public System.Nullable OrderDate + { + get + { + return this._OrderDate; + } + set + { + if ((this._OrderDate != value)) + { + this.OnOrderDateChanging(value); + this.SendPropertyChanging(); + this._OrderDate = value; + this.SendPropertyChanged("OrderDate"); + this.OnOrderDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CancelResult", DbType="NVarChar(100)")] + public string CancelResult + { + get + { + return this._CancelResult; + } + set + { + if ((this._CancelResult != value)) + { + this.OnCancelResultChanging(value); + this.SendPropertyChanging(); + this._CancelResult = value; + this.SendPropertyChanged("CancelResult"); + this.OnCancelResultChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSubmit", DbType="Bit")] + public System.Nullable IsSubmit + { + get + { + return this._IsSubmit; + } + set + { + if ((this._IsSubmit != value)) + { + this.OnIsSubmitChanging(value); + this.SendPropertyChanging(); + this._IsSubmit = value; + this.SendPropertyChanged("IsSubmit"); + this.OnIsSubmitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UsePosition", DbType="NVarChar(50)")] + public string UsePosition + { + get + { + return this._UsePosition; + } + set + { + if ((this._UsePosition != value)) + { + this.OnUsePositionChanging(value); + this.SendPropertyChanging(); + this._UsePosition = value; + this.SendPropertyChanged("UsePosition"); + this.OnUsePositionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UsingUnit", DbType="NVarChar(50)")] + public string UsingUnit + { + get + { + return this._UsingUnit; + } + set + { + if ((this._UsingUnit != value)) + { + this.OnUsingUnitChanging(value); + this.SendPropertyChanging(); + this._UsingUnit = value; + this.SendPropertyChanged("UsingUnit"); + this.OnUsingUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TeamGroupId", DbType="NVarChar(50)")] + public string TeamGroupId + { + get + { + return this._TeamGroupId; + } + set + { + if ((this._TeamGroupId != value)) + { + this.OnTeamGroupIdChanging(value); + this.SendPropertyChanging(); + this._TeamGroupId = value; + this.SendPropertyChanged("TeamGroupId"); + this.OnTeamGroupIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_ID", DbType="NVarChar(500)")] + public string STE_ID + { + get + { + return this._STE_ID; + } + set + { + if ((this._STE_ID != value)) + { + this.OnSTE_IDChanging(value); + this.SendPropertyChanging(); + this._STE_ID = value; + this.SendPropertyChanged("STE_ID"); + this.OnSTE_IDChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_STE_Name", DbType="NVarChar(500)")] + public string STE_Name + { + get + { + return this._STE_Name; + } + set + { + if ((this._STE_Name != value)) + { + this.OnSTE_NameChanging(value); + this.SendPropertyChanging(); + this._STE_Name = value; + this.SendPropertyChanged("STE_Name"); + this.OnSTE_NameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsNeedConfirm", DbType="Bit")] + public System.Nullable IsNeedConfirm + { + get + { + return this._IsNeedConfirm; + } + set + { + if ((this._IsNeedConfirm != value)) + { + this.OnIsNeedConfirmChanging(value); + this.SendPropertyChanging(); + this._IsNeedConfirm = value; + this.SendPropertyChanged("IsNeedConfirm"); + this.OnIsNeedConfirmChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InPutMan", DbType="NVarChar(50)")] + public string InPutMan + { + get + { + return this._InPutMan; + } + set + { + if ((this._InPutMan != value)) + { + this.OnInPutManChanging(value); + this.SendPropertyChanging(); + this._InPutMan = value; + this.SendPropertyChanged("InPutMan"); + this.OnInPutManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSteelStru", DbType="Bit")] + public System.Nullable IsSteelStru + { + get + { + return this._IsSteelStru; + } + set + { + if ((this._IsSteelStru != value)) + { + this.OnIsSteelStruChanging(value); + this.SendPropertyChanging(); + this._IsSteelStru = value; + this.SendPropertyChanged("IsSteelStru"); + this.OnIsSteelStruChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="Char(1)")] + public string Type + { + get + { + return this._Type; + } + set + { + if ((this._Type != value)) + { + this.OnTypeChanging(value); + this.SendPropertyChanging(); + this._Type = value; + this.SendPropertyChanged("Type"); + this.OnTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitStoreId", DbType="NVarChar(50)")] + public string UnitStoreId + { + get + { + return this._UnitStoreId; + } + set + { + if ((this._UnitStoreId != value)) + { + this.OnUnitStoreIdChanging(value); + this.SendPropertyChanging(); + this._UnitStoreId = value; + this.SendPropertyChanged("UnitStoreId"); + this.OnUnitStoreIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Temp_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)] + public Weld_WeldInfo Weld_WeldInfo + { + get + { + return this._Weld_WeldInfo.Entity; + } + set + { + Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity; + if (((previousValue != value) + || (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Weld_WeldInfo.Entity = null; + previousValue.Weld_UsingPlan_Temp.Remove(this); + } + this._Weld_WeldInfo.Entity = value; + if ((value != null)) + { + value.Weld_UsingPlan_Temp.Add(this); + this._WeldId = value.WeldId; + } + else + { + this._WeldId = default(string); + } + this.SendPropertyChanged("Weld_WeldInfo"); + } + } + } + + 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.Weld_View_ReleaseRecovery")] public partial class Weld_View_ReleaseRecovery { @@ -142162,6 +142876,8 @@ namespace Model private EntitySet _Weld_UsingMat; + private EntitySet _Weld_UsingPlan_Temp; + private EntitySet _Weld_UsingPlan; private EntityRef _Weld_WeldType; @@ -142201,6 +142917,7 @@ namespace Model this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); this._Weld_StockInit = new EntitySet(new Action(this.attach_Weld_StockInit), new Action(this.detach_Weld_StockInit)); this._Weld_UsingMat = new EntitySet(new Action(this.attach_Weld_UsingMat), new Action(this.detach_Weld_UsingMat)); + this._Weld_UsingPlan_Temp = new EntitySet(new Action(this.attach_Weld_UsingPlan_Temp), new Action(this.detach_Weld_UsingPlan_Temp)); this._Weld_UsingPlan = new EntitySet(new Action(this.attach_Weld_UsingPlan), new Action(this.detach_Weld_UsingPlan)); this._Weld_WeldType = default(EntityRef); OnCreated(); @@ -142495,6 +143212,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Temp_Weld_WeldInfo", Storage="_Weld_UsingPlan_Temp", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] + public EntitySet Weld_UsingPlan_Temp + { + get + { + return this._Weld_UsingPlan_Temp; + } + set + { + this._Weld_UsingPlan_Temp.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_UsingPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")] public EntitySet Weld_UsingPlan { @@ -142622,6 +143352,18 @@ namespace Model entity.Weld_WeldInfo = null; } + private void attach_Weld_UsingPlan_Temp(Weld_UsingPlan_Temp entity) + { + this.SendPropertyChanging(); + entity.Weld_WeldInfo = this; + } + + private void detach_Weld_UsingPlan_Temp(Weld_UsingPlan_Temp entity) + { + this.SendPropertyChanging(); + entity.Weld_WeldInfo = null; + } + private void attach_Weld_UsingPlan(Weld_UsingPlan entity) { this.SendPropertyChanging();