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/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/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">
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..b123b69c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Material/EquipmentEdit.aspx
@@ -18,7 +18,7 @@
-
+
@@ -36,7 +36,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..cb0d0ca4 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 + "]不存在！" + "|";
}
}
@@ -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))
@@ -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/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 @@
+ >
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls
index 58dfee40..cdb9a68e 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/设备信息导入模板.xls differ
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index f500905b..beb5e8d8 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
{
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