From f232d4c9015f6ea6cc8fd0997118ff7f63b64591 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Thu, 23 Feb 2023 16:55:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_V2023-02-23_gaofei.sql | 2 ++ .../CQMS/Material/CQMS_EquipmentService.cs | 2 ++ .../CQMS/Material/Equipment.aspx | 7 +++-- .../CQMS/Material/EquipmentEdit.aspx | 10 +++++++- .../CQMS/Material/EquipmentEdit.aspx.cs | 4 ++- .../Material/EquipmentEdit.aspx.designer.cs | 9 +++++++ .../CQMS/Material/EquipmentIn.aspx.cs | 20 +++++++++++---- .../CQMS/Material/MaterialEdit.aspx | 2 +- .../File/Excel/DataIn/设备信息导入模板.xls | Bin 25600 -> 25600 bytes SGGL/Model/Model.cs | 24 ++++++++++++++++++ 10 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-02-23_gaofei.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-02-23_gaofei.sql b/DataBase/版本日志/SGGLDB_V2023-02-23_gaofei.sql new file mode 100644 index 00000000..a01bceb2 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-02-23_gaofei.sql @@ -0,0 +1,2 @@ +alter table [dbo].[Material_Equipment] add Factory nvarchar(100) null +GO \ No newline at end of file diff --git a/SGGL/BLL/CQMS/Material/CQMS_EquipmentService.cs b/SGGL/BLL/CQMS/Material/CQMS_EquipmentService.cs index 5377e3c6..ede171f4 100644 --- a/SGGL/BLL/CQMS/Material/CQMS_EquipmentService.cs +++ b/SGGL/BLL/CQMS/Material/CQMS_EquipmentService.cs @@ -37,6 +37,7 @@ namespace BLL newEquipment.ArrivalDate = Equipment.ArrivalDate; newEquipment.CompileMan = Equipment.CompileMan; newEquipment.CompileDate = Equipment.CompileDate; + newEquipment.Factory = Equipment.Factory; db.Material_Equipment.InsertOnSubmit(newEquipment); db.SubmitChanges(); } @@ -62,6 +63,7 @@ namespace BLL newEquipment.Num = Equipment.Num; newEquipment.ArrivalDate = Equipment.ArrivalDate; newEquipment.InspectionId = Equipment.InspectionId; + newEquipment.Factory = Equipment.Factory; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx index 2d59c317..ae89b2b6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Material/Equipment.aspx @@ -29,7 +29,7 @@ - + @@ -67,7 +67,7 @@ HeaderTextAlign="Center"> + + diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx index 0847d20d..093c533b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx @@ -18,7 +18,7 @@ - + @@ -61,6 +61,14 @@ + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs index 3fc0a188..83c4350b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.cs @@ -56,6 +56,7 @@ namespace FineUIPro.Web.CQMS.Material { this.txtArrivalDate.Text = string.Format("{0:yyyy-MM-dd}", Equipment.ArrivalDate); } + this.txtFactory.Text = Equipment.Factory; } } } @@ -67,7 +68,7 @@ namespace FineUIPro.Web.CQMS.Material { if (this.drpUnit.SelectedValue == BLL.Const._Null) { - Alert.ShowInTop("请选择供货单位！", MessageBoxIcon.Warning); + Alert.ShowInTop("请选择采购单位！", MessageBoxIcon.Warning); return; } //if (this.drpMainItem.SelectedValue == BLL.Const._Null) @@ -101,6 +102,7 @@ namespace FineUIPro.Web.CQMS.Material Equipment.Unit = this.txtUnit.Text.Trim(); Equipment.Num = Funs.GetNewDecimalOrZero(this.txtNum.Text.Trim()); Equipment.ArrivalDate = Funs.GetNewDateTime(this.txtArrivalDate.Text.Trim()); + Equipment.Factory = this.txtFactory.Text.Trim(); Equipment.CompileMan = this.CurrUser.PersonId; Equipment.CompileDate = DateTime.Now; if (!string.IsNullOrEmpty(EquipmentId)) diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.designer.cs index c77ce80a..ad7d7787 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx.designer.cs @@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.Material { /// protected global::FineUIPro.NumberBox txtNum; + /// + /// txtFactory 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFactory; + /// /// Toolbar1 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs index 074457ae..a524d1be 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Material oleDBConn.Close(); oleDBConn.Dispose(); hdCheckResult.Text = "1"; - AddDatasetToSQL(ds.Tables[0], 10); + AddDatasetToSQL(ds.Tables[0], 11); } catch (Exception exc) { @@ -180,14 +180,14 @@ namespace FineUIPro.Web.CQMS.Material string row1 = pds.Rows[i][1].ToString(); if (string.IsNullOrEmpty(row1)) { - result += (i + 2).ToString() + "," + "供货单位名称" + "," + "此项为必填项！" + "|"; + result += (i + 2).ToString() + "," + "采购单位" + "," + "此项为必填项！" + "|"; } else { var unit = units.FirstOrDefault(x => x.UnitName == row1); if (unit == null) { - result += (i + 2).ToString() + "," + "供货单位名称" + "," + "[" + row1 + "]不存在！" + "|"; + result += (i + 2).ToString() + "," + "采购单位" + "," + "[" + row1 + "]不存在！" + "|"; } } @@ -258,6 +258,12 @@ namespace FineUIPro.Web.CQMS.Material //{ // result += (i + 2).ToString() + "," + "到货日期" + "," + "此项为必填项！" + "|"; //} + + string row10 = pds.Rows[i][10].ToString(); + if (string.IsNullOrEmpty(row10)) + { + result += (i + 2).ToString() + "," + "生产厂家" + "," + "此项为必填项！" + "|"; + } } } if (!string.IsNullOrEmpty(result)) @@ -365,7 +371,7 @@ namespace FineUIPro.Web.CQMS.Material oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 10); + AddDatasetToSQL2(ds.Tables[0], 11); } catch (Exception ex) { @@ -411,7 +417,10 @@ namespace FineUIPro.Web.CQMS.Material equipment.ProjectId = this.CurrUser.LoginProjectId; equipment.ContractNo = pds.Rows[i][0].ToString().Trim(); equipment.UnitId = units.First(e => e.UnitName == pds.Rows[i][1].ToString().Trim()).UnitId; - equipment.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + if (!string.IsNullOrEmpty(pds.Rows[i][2].ToString().Trim())) + { + equipment.MainItemId = mainItems.First(e => e.MainItemName == pds.Rows[i][2].ToString().Trim()).MainItemId; + } equipment.EquipmentName = pds.Rows[i][3].ToString().Trim(); equipment.SpecificationAndModel = pds.Rows[i][4].ToString().Trim(); equipment.EquipmentCode = pds.Rows[i][5].ToString().Trim(); @@ -419,6 +428,7 @@ namespace FineUIPro.Web.CQMS.Material equipment.Unit = pds.Rows[i][7].ToString().Trim(); equipment.Num = Funs.GetNewDecimalOrZero(pds.Rows[i][8].ToString().Trim()); equipment.ArrivalDate = Funs.GetNewDateTime(pds.Rows[i][9].ToString().Trim()); + equipment.Factory = pds.Rows[i][10].ToString().Trim(); equipment.CompileMan = this.CurrUser.PersonId; equipment.CompileDate = DateTime.Now; BLL.CQMS_EquipmentService.AddEquipment(equipment); diff --git a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx index 52950f31..ba52ef31 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Material/MaterialEdit.aspx @@ -66,7 +66,7 @@ - diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls index 58dfee40c19e6340a461037894083e96c831477c..2ef1f8baa9c51fc095d61a7580ea267a8f2d7144 100644 GIT binary patch delta 1062 zcmZ`(O=}ZT6g~H4CNq-{lNnNL{S2`PE~F9K1gvdRs}>h35{g0u1r)SF%n4mO!r{%Yil008A;k86ff#YyeX9WCd=-IvYmw)e&2iZ{>)=LYt&hzl`FFJ z@WtlY?@vFI+prh-R5#^4S`YuqVL?J2w912fMF=```|X{h@bL=3R`7`U!2P~wYOP|9 z^>HND=hmTM;I1TMYfnUX)0khdlMc=pM;r79yiA>7Z;K!3qIH6?ZH8EPGIfD+W&$9; zgFcq6x8YMmpiLH|Kg&ShV%~#;c*; z`@`y5txA(>)vKx%-=$`(g>P!BL)2CC^|p1K@_Z++KGbV_axh(n$F0K;X4>ak#q+;! zsq5oq^{4*R-@*_-^4C$Iz%Cz;@J3fv7Y}s2# z*?@s1KV=DtU!{~ym{=O%9CEl?Ozjpd%2cm&FD5cipco zbfbEz`y-J`*ksbH(cdE?ChZWBVA2gnWT44OW0E+DmXV;zMkk>hPgf>nF_{T*-P~Io w#=$gq25hj_RTpM27IaMF((*72^?LTS>PqkBrJi8VjT`z`Hq`p5i6@uM|2?|1TL1t6 diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 1f0c66db..24f8dd78 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -120367,6 +120367,8 @@ namespace Model private string _InspectionId; + private string _Factory; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -120407,6 +120409,8 @@ namespace Model partial void OnCompileDateChanged(); partial void OnInspectionIdChanging(string value); partial void OnInspectionIdChanged(); + partial void OnFactoryChanging(string value); + partial void OnFactoryChanged(); #endregion public Material_Equipment() @@ -120729,6 +120733,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Factory", DbType="NVarChar(100)")] + public string Factory + { + get + { + return this._Factory; + } + set + { + if ((this._Factory != value)) + { + this.OnFactoryChanging(value); + this.SendPropertyChanging(); + this._Factory = value; + this.SendPropertyChanged("Factory"); + this.OnFactoryChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Material_Equipment_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { From 4e8dc60165c061d5bc20fa5f625e6e31ad71cfed Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Fri, 24 Feb 2023 16:02:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BD=8D=E5=8F=B7=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CQMS/Material/EquipmentEdit.aspx | 2 +- .../CQMS/Material/EquipmentIn.aspx.cs | 10 +++++----- .../File/Excel/DataIn/设备信息导入模板.xls | Bin 25600 -> 25600 bytes 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx index 093c533b..b123b69c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx @@ -36,7 +36,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs index a524d1be..cb0d0ca4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentIn.aspx.cs @@ -219,11 +219,11 @@ namespace FineUIPro.Web.CQMS.Material // result += (i + 2).ToString() + "," + "规格型号" + "," + "此项为必填项！" + "|"; //} - string row5 = pds.Rows[i][5].ToString(); - if (string.IsNullOrEmpty(row5)) - { - result += (i + 2).ToString() + "," + "设备位号" + "," + "此项为必填项！" + "|"; - } + //string row5 = pds.Rows[i][5].ToString(); + //if (string.IsNullOrEmpty(row5)) + //{ + // result += (i + 2).ToString() + "," + "设备位号" + "," + "此项为必填项！" + "|"; + //} string row8 = pds.Rows[i][8].ToString(); if (!string.IsNullOrEmpty(row8)) diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls index 2ef1f8baa9c51fc095d61a7580ea267a8f2d7144..cdb9a68e2f460968f6f5946aaf41b6e718e7fd4d 100644 GIT binary patch delta 696 zcmZoT!PszuaYGIZTfzSMp=utJi&)wipKSiga+i^Xse!3s@+~%J#;VD3?Bd9zWEB&m zXZ8L%Lk1CsEes3{|LZ3(0x58M(yN+GC9!W0?BO_3D4--T$!pu7i zxWpNNHo{CpR?om7h*g}CfdkF_dXS?*7MP$(z{EMRiZd~YW3_;RfeVMY33l;d22Sh} z3^rKB85!)cI*5V64z7N)5~q(2-R$ou{>@6shiZniy{2d%I$Kl3>7m^|+c& zL-6K3&Yt3oj+5D0JGlaYDyMHlNu@vH!@ C=E>Lq delta 697 zcmZoT!PszuaYGIZn?a#lYO?#}B9=DBN1K1L++}3>SO2em@+~%JMxn`a?Bd9zq!1IM zXZ8L%Lk1CsEes3{|LZ3(0x58M(yN+GC9!W0?BO_3D4--T$!pu7i zxWpNNHo{CpR?om7h*g}CfdkF_dXS?*7MP$(z{EMRiZd~YW3_;RfeVMY33l;d22Sh} z3^rKB85!)cI*5V64z7N)5~q(2 ztI6&24je(UC!3fGr|tRnpB0!c{xdTKcyIpeaF!9`p2_E(A{jSK)^xUFTs=9(Ih6Hw zFaty2=6%kd;*9o_Iii>HaRI}V0T??Vnu}}l?r7J||DyLXaW)j#0+Z)WM&`*EU91 Date: Sat, 25 Feb 2023 17:28:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=85=B1=E6=A3=80=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx | 2 +- SGGL/SGGL.sln | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx index 9aad070a..1c2ce59f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheck.aspx @@ -46,7 +46,7 @@ + > diff --git a/SGGL/SGGL.sln b/SGGL/SGGL.sln index b3c13157..721038cf 100644 --- a/SGGL/SGGL.sln +++ b/SGGL/SGGL.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32825.248 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.2017 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" EndProject From 5c346509066c1f1c689e4f734ace4129ce984f24 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Sat, 25 Feb 2023 17:30:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=85=B1=E6=A3=80=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=AD=97?= =?UTF-8?q?=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx index 1d2e99f2..1e395662 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditJointCheckTwo.aspx @@ -60,7 +60,7 @@ + Enabled="false"> From fe2ef7ce705f512e142aee290919c032013427fd Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Mon, 27 Feb 2023 16:34:03 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=96=BD=E5=B7=A5=E6=96=B9=E6=A1=88=E9=A1=B9=E7=9B=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx index f7e53c37..436f9144 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx @@ -45,7 +45,7 @@ + >