From 5d70e1689aae867867a5c8c29c8092d39c2013d8 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Wed, 25 Sep 2024 15:13:49 +0800 Subject: [PATCH] 2 --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65536 -> 65536 bytes SGGL/BLL/CLGL/TwConst.cs | 4 +- .../CLGL/InPlanMasterDataIn.aspx | 1 + .../CLGL/InPlanMasterDataIn.aspx.designer.cs | 9 + SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx | 15 +- SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs | 31 +- .../CLGL/OutPlanMaster.aspx.designer.cs | 9 + .../FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx | 11 +- .../CLGL/OutPlanMasterEdit.aspx.cs | 59 +++- .../CLGL/OutPlanMasterEdit.aspx.designer.cs | 13 +- .../CLGL/OutPlanMasterOut.aspx.cs | 2 +- .../CLGL/OutPlanMasterSelect.aspx | 10 +- .../CLGL/OutPlanMasterSelect.aspx.cs | 324 +++++------------- SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx | 11 +- .../HJGL/WeldingManage/PipelineMatIn.aspx.cs | 2 +- SGGL/Model/Model.cs | 290 +++++++++------- 16 files changed, 372 insertions(+), 419 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 9980bd211c1236d538bc80081373e31c8820ede7..925b2b9b506a2e792bdee378110e2b85fec2ef0e 100644 GIT binary patch delta 1817 zcmcIkO>7%g5cb=wla0Ini+_|TCP|Y`?W8uW9pf6wEh}tjZCBYCHz)}~ib)zk0;x#0 zRP~aDQ-uPe`@w-*Y0gMdR#hb~SWOP8kjRk(7j9fZiX|*T;Z4%5+(tnSh>>RB&b)au z-~7C17@}c_o9_#r&0mac%kvW(ayT5#KHLy)uo7C`YwRoc2SQmRE7Vz=iH< z{^2BniNo0t|D$a`Un87doKJB+%lRQ~aO&s(GH3dC^EJpBvKZ+l#V{AfQ4s_9TvV9X zx+~seo@?c2#)SQz;Ax3F`I9@dBicv^T{mYx1-P{&g$POyXM)$unV>v`TO2%s#m55p zS`4tTbys?a!RL}hA2&wKHP=gFh{y1oD-e&7k4G9>8*CLR`?x2e6 zfy*+@)mVoIrl1wjWhYk!I@OoZ2ojRBE-%+siLyGl^PCol2yWtE-7xdO4kV zF;zRas%EaHms2XfxdL;zi4SK7Fh3iGro4-o(C_=S^1;;Rk5=g0rTFi;t6zO=u|KXc zXhjhPW#xDaGbdW&neUj}5#@O3(%4mVUf=?6)IQcBPK6@37*bmqik}QeFL{&<3Y@VWLh$e{>URK`wrv&rv zgPiDruyaE_r(=5}iT&J+OdYo0FdAIc&##-gf=ut&(}&!QT+sD??225_19Qa1Wd5*l zsdcs$-#)g&R{LC!a3?ElWp<8UH~HYYaqmQ1uNcCHp^28E8O$;Y(;_~bxrqzKFz<6e zeir)hMr8^Qif)9e}dBM8Qd=h@x@RaTDgg4HH`3;1>Y(kztl=P zv65DkiL^Qeqf|Q17{AWW{Oeh<2Iis+{&@u}ixFt^%?)ktvAm(Z$xvAc;mgJEaeG0- h(pw|GxjpKZ!(mT9)N$2RVi+CoHy5>&nBQ5t{Wn?4e?0atCyJcBhVImZ^Y|EBirQ5V?*b81FO-S5% zX`)Q@MGYo0hZo;^N%Xa0(wO+-nl`aXRcg~{n!flim_Py#TF)66vPf-f6HjvH%lA9q zxqauHZ#0e9H2%gMXP>|HmHk8M5$muaIp8vPnWbQzn}iWhgatvZ%L?@0Ek5aG z-0YjA!#0})jPHawUdSE9T_bW6vI9AQOe!L-f8lxv*H+}_ZJcBlIsbvt`A)>Tk(Z{N zu*}P>&A7>b!|XF-PYib934y{|gHvun6Mv#PGD&2GxexL7E%T!ku7FH(E6j%NJ*8pk zJ|j%22ha8*_aVFCD(_(Xjhn*TOeEuEgc$moa#B|f;DbM!9DPS>5IPpx-qU4Us;2s# zrX)K_Dr^F}njh(+=YKVCzb#@kkFBav1F*xeZcm#q-6n}m*b8dQf zKy|0Zqp0QDrRjbkSlvh(u(m%fG4e;@SU#a*Kl`6kg^iY!#3)rVLqraYN^6?IEiPi_ zETeQ!&XW?Oq<1CquSrK?#C420VY4kQP=8r|SQ6CsNy)|`)>ey;!+QIwNYh3$Z5^)< zmpavG2{V1d70|~y%AA$Q14(Rebz`c8* z_4BDq(Hp-Ru5V|88z*MJ{K&Xh46_yAEhaIVR1fk_nnSq3Gy`dY2Hb+#7^uOYB}Ri4 zti}654Q1g@I9MM+I1HQJ6I45+(zD1`2A<~O#V-=7`MzhSr}vC(1rl3i`e21Mf;#vy zJ8f*fa+ljPUiAYQyl8C38#ui`DbQ17WzL)L#*+6m+>V@pE8fwXRWn=Odi>1ksD#s4 zmsj=3C=C@`$b|9mTrUIVd=<2d zzk{5YJ9DdBJzp%wBc(!rsa)>=fPR`djzrK|=(?_4VDL-M2fp(jkaI40 StateMap = new Dictionary { diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx index fff90342..16f92d08 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx @@ -28,6 +28,7 @@ + diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.designer.cs index 336a62e3..8fc8bb3d 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterDataIn.aspx.designer.cs @@ -94,5 +94,14 @@ namespace FineUIPro.Web.CLGL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdFileName; + + /// + /// lb1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lb1; } } diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx index a5b2a51e..903c7027 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx @@ -119,6 +119,12 @@ + + + + @@ -137,10 +143,7 @@ - - - + @@ -220,9 +223,9 @@ IsModal="true" Width="700px" Height="470px" OnClose="Window2_Close"> - <%-- - --%> + diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs index ca281278..2016b408 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.cs @@ -243,7 +243,16 @@ namespace FineUIPro.Web.CLGL { if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.Tw_OutPlanMasterMenuId, Const.BtnAdd)) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx", "新增 - "))); + if (string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + { + Alert.ShowInTop("请选择单位工程！", MessageBoxIcon.Warning); + return; + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?UnitWorkId={0} ", tvControlItem.SelectedNodeID, "新增 - "))); + + } } else { @@ -329,6 +338,23 @@ namespace FineUIPro.Web.CLGL protected void btnMenuInOutPlanMasterEdit_Click(object sender, EventArgs e) { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); + return; + } + string planId = Grid1.SelectedRowID; + var planMaster = BLL.TwInOutplanmasterService.GetById(planId); + if (planMaster.State != (int)TwConst.State.待提交 || planMaster.TypeInt != (int)TwConst.TypeInt.散件出库) + { + Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning); + return; + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterEdit.aspx?UnitWorkId={0}&Id={1} ", tvControlItem.SelectedNodeID, planId, "新增 - "))); + + } } protected void btnPassMaster_OnClick(object sender, EventArgs e) @@ -573,8 +599,9 @@ namespace FineUIPro.Web.CLGL } } } + #endregion - + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs index 7c27624a..d4e274ce 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMaster.aspx.designer.cs @@ -320,6 +320,15 @@ namespace FineUIPro.Web.CLGL /// protected global::FineUIPro.Menu Menu1; + /// + /// btnMenuInOutPlanMasterEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuInOutPlanMasterEdit; + /// /// btnMenuInOutPlanMasterDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx index 94597524..bb8e6845 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx @@ -17,7 +17,7 @@
- @@ -47,7 +47,10 @@ - + + + @@ -70,7 +73,7 @@ - @@ -107,7 +110,7 @@
diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs index fd28df8d..c30aec82 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FastReport.Utils; using FineUIPro.Web.DataShow; using FineUIPro.Web.HJGL.WeldingManage; using FineUIPro.Web.ProjectData; @@ -48,18 +49,35 @@ namespace FineUIPro.Web.CLGL if (!IsPostBack) { InitDrpList(); - UnitWorkId = Request.QueryString["UnitWorkId"]; - Id = Request.QueryString["Id"]; + UnitWorkId = Request.Params["UnitWorkId"]; + Id = Request.Params["Id"]; if (!string.IsNullOrEmpty(Id)) { var queryModel = new Model.Tw_InOutMasterOutput() { Id=Id, }; + var result = BLL.TwInOutplanmasterService.GetListData(queryModel).FirstOrDefault(); + if (!string .IsNullOrEmpty(result.WeldTaskId) && result.WeldTaskId.Contains("|")) + { + UnitWorkId = result.WeldTaskId.Split('|')[0]; + + } + else + { + UnitWorkId = result.WeldTaskId; + } txtCreateMan.Text = result.CreateManName; txtCreateDate.Text =result.CreateDate.Value.ToString("yyyy-MM-dd"); drpReqUnit.SelectedValue = result.ReqUnitId; + drpTypeInt.SelectedValue = result.TypeInt.ToString(); + drpWarehouse.SelectedValue = result.WarehouseCode; + drpCategory.SelectedValue = result.Category.ToString(); + txtRemark.Text = result.Remark; + txtCusBillCode.Text = result.CusBillCode; + + drpCategory.Readonly = true; BindGrid(Id); } else @@ -78,15 +96,18 @@ namespace FineUIPro.Web.CLGL drpWarehouse.DataTextField = "Text"; drpWarehouse.DataValueField = "Value"; drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode(); - drpWarehouse.DataBind(); - Funs.FineUIPleaseSelect(this.drpWarehouse); + drpWarehouse.DataBind(); drpTypeInt.DataTextField = "Key"; drpTypeInt.DataValueField = "Value"; - drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => x.Key.Contains("出库")); ; - drpTypeInt.DataBind(); - Funs.FineUIPleaseSelect(this.drpTypeInt); + drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => x.Key.Contains("散件出库")); ; + drpTypeInt.DataBind(); UnitService.InitUnitDropDownList(drpReqUnit, this.CurrUser.LoginProjectId, true); + drpCategory.DataTextField = "Key"; + drpCategory.DataValueField = "Value"; + drpCategory.DataSource = BLL.TwConst.CategoryMap; + drpCategory.DataBind(); + } private void BindGrid(string inOutPlanMasterId) { @@ -105,7 +126,8 @@ namespace FineUIPro.Web.CLGL /// protected void btnSelect_Click(object sender, EventArgs e) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterSelect.aspx", "选择- "))); + Save(Const.BtnSave); + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OutPlanMasterSelect.aspx?UnitWorkId={0}&Id={1}",UnitWorkId,Id, "选择- "))); } #endregion @@ -153,18 +175,17 @@ namespace FineUIPro.Web.CLGL TypeInt = int.Parse( drpTypeInt.SelectedValue), Remark = txtRemark.Text, InOutType=(int)TwConst.InOutType.出库, - Category= (int)TwConst.Category.全部, + Category= int.Parse(drpCategory.SelectedValue), State=state }; TwInOutplanmasterService.Add(model); } else { - var model = TwInOutplanmasterService.GetById(Id); - model.ProjectId = this.CurrUser.LoginProjectId; + var model = TwInOutplanmasterService.GetById(Id); model.CusBillCode = txtCusBillCode.Text; model.WarehouseCode = drpWarehouse.SelectedValue; - model.WeldTaskId = UnitWorkId; + // model.WeldTaskId = UnitWorkId; model.Source = 1; model.CreateDate = DateTime.Now; model.CreateMan = this.CurrUser.PersonId; @@ -172,11 +193,11 @@ namespace FineUIPro.Web.CLGL model.TypeInt = int.Parse(drpTypeInt.SelectedValue); model.Remark = txtRemark.Text; model.InOutType = (int)TwConst.InOutType.出库; - model.Category = (int)TwConst.Category.全部; + model.Category = int.Parse(drpCategory.SelectedValue); model.State = state; TwInOutplanmasterService.Update(model); - } - + } + SaveDetail(); } /// @@ -192,8 +213,9 @@ namespace FineUIPro.Web.CLGL { JObject values = teamGroupRow.Value("values"); int rowIndex = teamGroupRow.Value("index"); + string id = teamGroupRow.Value("id"); - var mdoel=TwInoutplandetailRelationService.GetById(values.Value("Id")); + var mdoel=TwInoutplandetailRelationService.GetById(id); if (mdoel != null) { mdoel.Number= values.Value("Number"); @@ -214,5 +236,10 @@ namespace FineUIPro.Web.CLGL BindGrid(Id); } } + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + BindGrid(Id); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.designer.cs index d39929a3..74fbdb80 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterEdit.aspx.designer.cs @@ -24,13 +24,13 @@ namespace FineUIPro.Web.CLGL protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// - /// Form2 控件。 + /// SimpleForm1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Form Form2; + protected global::FineUIPro.Form SimpleForm1; /// /// TbCreate 控件。 @@ -95,6 +95,15 @@ namespace FineUIPro.Web.CLGL /// protected global::FineUIPro.DropDownList drpTypeInt; + /// + /// drpCategory 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCategory; + /// /// txtCusBillCode 控件。 /// diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs index 8bfb45a4..9adf70c9 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterOut.aspx.cs @@ -32,7 +32,7 @@ namespace FineUIPro.Web.CLGL if (!string.IsNullOrEmpty(Id)) { Model.Tw_InOutMasterOutput table = new Model.Tw_InOutMasterOutput(); - table.InOutPlanMasterId = Id; + table.Id = Id; var model = TwInOutplanmasterService.GetListData(table).FirstOrDefault(); txtCusBillCode.Text = TwOutputmasterService.GetCusBillCodeByTaskCode(model.WeldTaskCode, (TwConst.TypeInt)model.TypeInt, (BLL.TwConst.Category)model.Category); diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx index 3498fb1d..6f43f7fe 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx @@ -64,11 +64,11 @@ - diff --git a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs index 84464fe6..9eed4e14 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/OutPlanMasterSelect.aspx.cs @@ -11,7 +11,7 @@ namespace FineUIPro.Web.CLGL public partial class OutPlanMasterSelect : PageBase { #region 定义项 - + /// /// 单位工程主键 /// @@ -52,7 +52,10 @@ namespace FineUIPro.Web.CLGL { if (!IsPostBack) { + UnitWorkId=Request.QueryString["UnitWorkId"]; + Id = Request.QueryString["Id"]; this.InitTreeMenu();//加载树 + InitDropList(); } } #endregion @@ -209,20 +212,64 @@ namespace FineUIPro.Web.CLGL /// private void BindGrid() { - //var tb=from x in Funs.DB.HJGL_PipeLineMat - // join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId - // join z in Funs.DB.Tw_MaterialStock on x.MaterialCode equals z.PipeLineMatCode - // where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitWorkId == this.UnitWorkId && y.PipelineId== this.tvControlItem.SelectedNodeID + // 确保 SelectedNodeID 不为空 + if (this.tvControlItem.SelectedNodeID == null) + { + + return; // 或者显示一个提示 + } + int Category=(int)TwInOutplanmasterService.GetById(Id).Category; + var tb = (from x in Funs.DB.HJGL_PipeLineMat + join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId + join z in Funs.DB.Tw_MaterialStock on x.MaterialCode equals z.PipeLineMatCode into zz + from z in zz.DefaultIfEmpty() + join lib in Funs.DB.HJGL_MaterialCodeLib on x.MaterialCode equals lib.MaterialCode + where y.ProjectId == this.CurrUser.LoginProjectId + && y.UnitWorkId == this.UnitWorkId + && y.PipelineId == this.tvControlItem.SelectedNodeID + && (x.PrefabricatedComponents==null||x.PrefabricatedComponents=="") + select new + { + x.PipeLineMatId, + x.PipelineId, + x.MaterialCode, + lib.MaterialName, + lib.MaterialSpec, + lib.MaterialUnit, + PlanNum = x.Number, + StockNum=z.StockNum??0, + x.IsLooseParts, + }).ToList(); + if (Category == (int)TwConst.Category.管段) + { + tb=tb.Where(x=>x.MaterialUnit.Contains("米")).ToList(); + } + else + { + tb = tb.Where(x => x.MaterialUnit.Contains("个")).ToList(); + + } + var inoutplandetail = (from x in Funs.DB.Tw_InOutPlanDetail_Relation + where x.InOutPlanMasterId == Id && x.PipelineId == this.tvControlItem.SelectedNodeID + select x).ToList(); + + // 优化 Linq 过滤条件 + tb = (from x in tb + join y in inoutplandetail on x.MaterialCode equals y.MaterialCode into yy + from y in yy.DefaultIfEmpty() + where y == null + select x).ToList(); - ////var tb = PipelineMatService.GetPipeLineMatsByPipelineId(this.tvControlItem.SelectedNodeID); - //Grid1.DataSource = tb; - //Grid1.DataBind(); + Grid1.RecordCount = tb.Count; + Grid1.DataSource = tb; + Grid1.DataBind(); } + private void InitDropList() { - /* var pipeline = (from x in Funs.DB.HJGL_Pipeline + var pipeline = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId select x.FlowingSection).Distinct().ToList(); @@ -230,7 +277,7 @@ namespace FineUIPro.Web.CLGL this.drpFlowingSection.DataValueField = "Value"; this.drpFlowingSection.DataSource = pipeline; this.drpFlowingSection.DataBind(); - Funs.FineUIPleaseSelect(drpFlowingSection);*/ + Funs.FineUIPleaseSelect(drpFlowingSection); } #endregion @@ -268,254 +315,43 @@ namespace FineUIPro.Web.CLGL /// protected void btnAccept_Click(object sender, EventArgs e) { - //PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference()); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } protected void btnSave_Click(object sender, EventArgs e) { - /*if (string.IsNullOrEmpty(this.txtTaskCode.Text.Trim())) - { - ShowNotify("请输入焊接任务单编号", MessageBoxIcon.Warning); - return; - } - if (!string.IsNullOrEmpty(txtTaskDate.Text)) - { - if (!string.IsNullOrEmpty(TaskDate)) - { - SaveTask(false); - BindGrid(); - } - else - { - var task = from x in Funs.DB.HJGL_WeldTask - where x.UnitWorkId == UnitWorkId && x.UnitId == this.drpUnit.SelectedValue - && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") - select x; - if (task.Count() > 0) - { - ShowNotify("所选预计焊接日期已存在,请重新选择！", MessageBoxIcon.Warning); - return; - } - else - { - SaveTask(false); - TaskDate = txtTaskDate.Text; - BindGrid(); - } - } - } - - else - { - ShowNotify("请选择预计焊接日期", MessageBoxIcon.Warning); - return; - }*/ - - } - private void SaveTask(bool IsCloseForm) - { - /*var weldingRods = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "2" select x; - var weldingWires = from x in Funs.DB.Base_Consumables where x.ConsumablesType == "1" select x; - string[] selectRowId = Grid1.SelectedRowIDArray; - for (int i = 0; i < selectRowId.Count(); i++) - { - string canWeldingRodName = string.Empty; - string canWeldingWireName = string.Empty; - Model.HJGL_WeldTask NewTask = new Model.HJGL_WeldTask(); - NewTask.ProjectId = this.CurrUser.LoginProjectId; - NewTask.UnitWorkId = this.UnitWorkId; - NewTask.UnitId = drpUnit.SelectedValue; - - NewTask.TaskCode = this.txtTaskCode.Text.Trim(); - NewTask.WeldTaskId = SQLHelper.GetNewID(); - NewTask.WeldJointId = selectRowId[i]; - var oldWeldTask = BLL.WeldTaskService.GetWeldTaskByWeldJointId(NewTask.WeldJointId); - if (oldWeldTask != null) - { - ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning); - return; - } - Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId); - if (weldJoint != null) - { - NewTask.WeldingRod = weldJoint.WeldingRod; - NewTask.WeldingWire = weldJoint.WeldingWire; - //获取可替代焊丝焊条 - var mat = BLL.Base_MaterialService.GetMaterialByMaterialId(weldJoint.Material1Id); - string matClass = mat.MaterialClass; - var matRod = weldingRods.FirstOrDefault(x => x.ConsumablesId == weldJoint.WeldingRod); - if (matRod != null) - { - foreach (var item in weldingRods) - { - if (matClass == "Fe-1" || matClass == "Fe-3") - { - if (IsCoverClass(matRod.SteelType, item.SteelType)) - { - canWeldingRodName = canWeldingRodName + item.ConsumablesName + ","; - } - } - else - { - if (matRod.SteelType == item.SteelType) - { - canWeldingRodName = canWeldingRodName + item.ConsumablesName + ","; - } - } - } - if (!string.IsNullOrEmpty(canWeldingRodName)) - { - NewTask.CanWeldingRodName = canWeldingRodName.Substring(0, canWeldingRodName.Length - 1); - } - } - var matWire = weldingWires.FirstOrDefault(x => x.ConsumablesId == weldJoint.WeldingWire); - if (matWire != null) - { - foreach (var item in weldingWires) - { - if (matClass == "Fe-1" || matClass == "Fe-3") - { - if (IsCoverClass(matWire.SteelType, item.SteelType)) - { - canWeldingWireName = canWeldingWireName + item.ConsumablesName + ","; - } - } - else - { - if (matWire.SteelType == item.SteelType) - { - canWeldingWireName = canWeldingWireName + item.ConsumablesName + ","; - } - } - } - if (!string.IsNullOrEmpty(canWeldingWireName)) - { - NewTask.CanWeldingWireName = canWeldingWireName.Substring(0, canWeldingWireName.Length - 1); - } - } - } - //NewTask.JointAttribute = drpJointAttribute.SelectedValue; - NewTask.JointAttribute = weldJoint.JointAttribute; - NewTask.WeldingMode = drpWeldingMode.SelectedValue; - - NewTask.TaskDate = Convert.ToDateTime(txtTaskDate.Text); - NewTask.Tabler = this.CurrUser.PersonId; - NewTask.TableDate = DateTime.Now; - - weldJoint.WeldingMode = drpWeldingMode.SelectedValue; - BLL.WeldJointService.UpdateWeldJoint(weldJoint); - BLL.WeldTaskService.AddWeldTask(NewTask); - } - //string pipelineId = this.tvControlItem.SelectedNodeID; - //var model = BLL.PipelineService.GetPipelineByPipelineId(pipelineId); - //model.State = 1; - //PipelineService.UpdatePipeline(model); - ShowNotify("保存成功！", MessageBoxIcon.Success); - if (IsCloseForm) - { - PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(txtTaskDate.Text) + ActiveWindow.GetHidePostBackReference()); - - }*/ - //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } - - /// - /// 判断耗材强度是否大于WPS耗材强度，如是为true,否则为false - /// - /// - /// - /// - private bool IsCoverClass(string wpsClass, string matClass) - { - bool isCover = false; - /*int wpsSn = 0; - int matSn = 0; - if (wpsClass.Length > 2 && matClass.Length > 2) - { - string wpsPre = wpsClass.Substring(0, wpsClass.Length - 2); - string matPre = matClass.Substring(0, matClass.Length - 2); - - string wps = wpsClass.Substring(wpsClass.Length - 1, 1); - wpsSn = Funs.GetNewInt(wps).HasValue ? Funs.GetNewInt(wps).Value : 0; - - string mat = matClass.Substring(matClass.Length - 1, 1); - matSn = Funs.GetNewInt(mat).HasValue ? Funs.GetNewInt(mat).Value : 0; - - if (wpsPre == matPre && matSn >= wpsSn) - { - return true; - } - }*/ - return isCover; - } - #endregion - - protected void txtTaskDate_TextChanged(object sender, EventArgs e) - { - // this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text, UnitWorkId, drpUnit.SelectedValue); - } - protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e) - { - //this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text, UnitWorkId, drpUnit.SelectedValue); - - } - protected void drpJointAttribute_SelectedIndexChanged(object sender, EventArgs e) - { + Save(); BindGrid(); } - - /// - /// 行绑定事件（没有焊接方法无法选择） - /// - /// - /// - protected void Grid1_RowDataBound(object sender, GridRowEventArgs e) + private void Save() { - /*DataRowView row = e.DataItem as DataRowView; - if (string.IsNullOrEmpty(row["WeldingMethodCode"].ToString())) + var List_Id = Grid1.SelectedRowIDArray; + if (List_Id != null) { - e.RowSelectable = false; - - };*/ - } - - protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) - { - - if (e.CommandName == "ResetWpq") - { - /*var weldJointId = e.RowID; - var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId); - if (model != null) + foreach (var id in List_Id) { - model.WPQId = null; - WeldJointService.UpdateWeldJoint(model); - - List wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue); - if (wpqList != null) + var hJGL_PipeLineMat = BLL.PipelineMatService.GetPipeLineMat(id); + if (hJGL_PipeLineMat != null) { - Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint(); - Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId); - - newJot.WPQId = wps.WPQId; - newJot.WeldJointId = model.WeldJointId; - newJot.WeldingRod = wps.WeldingRod; - newJot.WeldingWire = wps.WeldingWire; - newJot.WeldingMethodId = wps.WeldingMethodId; - newJot.GrooveTypeId = wps.GrooveType; - newJot.PreTemperature = wps.PreTemperature; - newJot.IsHotProess = wps.IsHotProess; - newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode)); - - BLL.WeldJointService.UpdateConWeldJoint(newJot); + var model = new Model.Tw_InOutPlanDetail_Relation() + { + Id = SQLHelper.GetNewID(), + PipelineId = hJGL_PipeLineMat.PipelineId, + MaterialCode = hJGL_PipeLineMat.MaterialCode, + Number = hJGL_PipeLineMat.Number, + PrefabricatedComponents = hJGL_PipeLineMat.PrefabricatedComponents, + InOutPlanMasterId = Id, + }; + TwInoutplandetailRelationService.Add(model); } - BindGrid(); - ShowNotify("焊评已重置！", MessageBoxIcon.Success); - }*/ - } + } + } + TwInOutplandetailService.GenInOutPlanDetailByInoutPlanMasterId(Id); + } + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx index f3c99689..32fe173f 100644 --- a/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/OutputMaster.aspx @@ -122,6 +122,12 @@ + + + + @@ -133,10 +139,7 @@ - - - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs index af9f5414..64da560b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs @@ -425,7 +425,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } else { - result.Add((i + 2) + "Line, [预制组件] 不能为空
"); + // result.Add((i + 2) + "Line, [预制组件] 不能为空
"); } } var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index cbf3d843..67153f85 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -11966,7 +11966,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] public string ApproveIdea { get @@ -95676,6 +95676,8 @@ namespace Model private string _PrefabricatedComponents; + private System.Nullable _IsLooseParts; + private EntityRef _HJGL_MaterialCodeLib; private EntityRef _HJGL_Pipeline; @@ -95694,6 +95696,8 @@ namespace Model partial void OnNumberChanged(); partial void OnPrefabricatedComponentsChanging(string value); partial void OnPrefabricatedComponentsChanged(); + partial void OnIsLoosePartsChanging(System.Nullable value); + partial void OnIsLoosePartsChanged(); #endregion public HJGL_PipeLineMat() @@ -95811,6 +95815,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLooseParts", DbType="Bit")] + public System.Nullable IsLooseParts + { + get + { + return this._IsLooseParts; + } + set + { + if ((this._IsLooseParts != value)) + { + this.OnIsLoosePartsChanging(value); + this.SendPropertyChanging(); + this._IsLooseParts = value; + this.SendPropertyChanged("IsLooseParts"); + this.OnIsLoosePartsChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PipeLineMat_HJGL_MaterialCodeLib", Storage="_HJGL_MaterialCodeLib", ThisKey="MaterialCode", OtherKey="MaterialCode", IsForeignKey=true)] public HJGL_MaterialCodeLib HJGL_MaterialCodeLib { @@ -152718,7 +152742,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] public string AttentPerson { get @@ -183677,7 +183701,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")] public string ProjectDescription { get @@ -183797,7 +183821,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")] public string CalculationRule { get @@ -183857,7 +183881,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")] public string ConstructionSubcontractor { get @@ -184241,7 +184265,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] public System.Nullable WorkPackageEstimate { get @@ -184546,16 +184570,6 @@ namespace Model private string _ProjectId; - private string _ContractId; - - private string _OrderCode; - - private System.Nullable _OrderInDate; - - private System.Nullable _OrderOutDate; - - private string _MaterialRequisitionUnit; - private System.Nullable _State; private string _InvoiceCode; @@ -184584,6 +184598,16 @@ namespace Model private string _CreateUser; + private string _ContractId; + + private System.Nullable _OrderInDate; + + private string _OrderCode; + + private System.Nullable _OrderOutDate; + + private string _MaterialRequisitionUnit; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -184592,16 +184616,6 @@ namespace Model partial void OnInvoiceIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnContractIdChanging(string value); - partial void OnContractIdChanged(); - partial void OnOrderCodeChanging(string value); - partial void OnOrderCodeChanged(); - partial void OnOrderInDateChanging(System.Nullable value); - partial void OnOrderInDateChanged(); - partial void OnOrderOutDateChanging(System.Nullable value); - partial void OnOrderOutDateChanged(); - partial void OnMaterialRequisitionUnitChanging(string value); - partial void OnMaterialRequisitionUnitChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); partial void OnInvoiceCodeChanging(string value); @@ -184630,6 +184644,16 @@ namespace Model partial void OnCreateDateChanged(); partial void OnCreateUserChanging(string value); partial void OnCreateUserChanged(); + partial void OnContractIdChanging(string value); + partial void OnContractIdChanged(); + partial void OnOrderInDateChanging(System.Nullable value); + partial void OnOrderInDateChanged(); + partial void OnOrderCodeChanging(string value); + partial void OnOrderCodeChanged(); + partial void OnOrderOutDateChanging(System.Nullable value); + partial void OnOrderOutDateChanged(); + partial void OnMaterialRequisitionUnitChanging(string value); + partial void OnMaterialRequisitionUnitChanged(); #endregion public PHTGL_Invoice() @@ -184677,106 +184701,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] - public string ContractId - { - get - { - return this._ContractId; - } - set - { - if ((this._ContractId != value)) - { - this.OnContractIdChanging(value); - this.SendPropertyChanging(); - this._ContractId = value; - this.SendPropertyChanged("ContractId"); - this.OnContractIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] - public string OrderCode - { - get - { - return this._OrderCode; - } - set - { - if ((this._OrderCode != value)) - { - this.OnOrderCodeChanging(value); - this.SendPropertyChanging(); - this._OrderCode = value; - this.SendPropertyChanged("OrderCode"); - this.OnOrderCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] - public System.Nullable OrderInDate - { - get - { - return this._OrderInDate; - } - set - { - if ((this._OrderInDate != value)) - { - this.OnOrderInDateChanging(value); - this.SendPropertyChanging(); - this._OrderInDate = value; - this.SendPropertyChanged("OrderInDate"); - this.OnOrderInDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] - public System.Nullable OrderOutDate - { - get - { - return this._OrderOutDate; - } - set - { - if ((this._OrderOutDate != value)) - { - this.OnOrderOutDateChanging(value); - this.SendPropertyChanging(); - this._OrderOutDate = value; - this.SendPropertyChanged("OrderOutDate"); - this.OnOrderOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] - public string MaterialRequisitionUnit - { - get - { - return this._MaterialRequisitionUnit; - } - set - { - if ((this._MaterialRequisitionUnit != value)) - { - this.OnMaterialRequisitionUnitChanging(value); - this.SendPropertyChanging(); - this._MaterialRequisitionUnit = value; - this.SendPropertyChanged("MaterialRequisitionUnit"); - this.OnMaterialRequisitionUnitChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] public System.Nullable State { @@ -185057,6 +184981,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] + public string ContractId + { + get + { + return this._ContractId; + } + set + { + if ((this._ContractId != value)) + { + this.OnContractIdChanging(value); + this.SendPropertyChanging(); + this._ContractId = value; + this.SendPropertyChanged("ContractId"); + this.OnContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] + public System.Nullable OrderInDate + { + get + { + return this._OrderInDate; + } + set + { + if ((this._OrderInDate != value)) + { + this.OnOrderInDateChanging(value); + this.SendPropertyChanging(); + this._OrderInDate = value; + this.SendPropertyChanged("OrderInDate"); + this.OnOrderInDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] + public string OrderCode + { + get + { + return this._OrderCode; + } + set + { + if ((this._OrderCode != value)) + { + this.OnOrderCodeChanging(value); + this.SendPropertyChanging(); + this._OrderCode = value; + this.SendPropertyChanged("OrderCode"); + this.OnOrderCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] + public System.Nullable OrderOutDate + { + get + { + return this._OrderOutDate; + } + set + { + if ((this._OrderOutDate != value)) + { + this.OnOrderOutDateChanging(value); + this.SendPropertyChanging(); + this._OrderOutDate = value; + this.SendPropertyChanged("OrderOutDate"); + this.OnOrderOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] + public string MaterialRequisitionUnit + { + get + { + return this._MaterialRequisitionUnit; + } + set + { + if ((this._MaterialRequisitionUnit != value)) + { + this.OnMaterialRequisitionUnitChanging(value); + this.SendPropertyChanging(); + this._MaterialRequisitionUnit = value; + this.SendPropertyChanged("MaterialRequisitionUnit"); + this.OnMaterialRequisitionUnitChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -299645,7 +299669,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] public string Name { get @@ -300222,7 +300246,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -300413,7 +300437,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -305724,7 +305748,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -307196,7 +307220,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -316747,7 +316771,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] public string ContractNo { get @@ -316767,7 +316791,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] public string UnitWorks { get