From 5d9374cdd71cce987b603ca0584f175f3eb02e94 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Mon, 22 Apr 2024 11:19:05 +0800
Subject: [PATCH] =?UTF-8?q?20240422=20=E7=BB=BC=E5=90=88=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_WH_2024-04-22-bwj.sql | 7 +
.../Comprehensive/DataReceivingDocService.cs | 1 +
.../Comprehensive/DesignChangeOrderService.cs | 2 +
.../Comprehensive/InspectionMachineService.cs | 2 +
.../Comprehensive/InspectionPersonService.cs | 2 +
.../Comprehensive/NCRManagementService.cs | 1 +
SGGL/BLL/Common/Const.cs | 2 +-
.../CQMS/Comprehensive/DataReceivingDoc.aspx | 2 +-
.../Comprehensive/DataReceivingDocDataIn.aspx | 231 +---
.../DataReceivingDocDataIn.aspx.cs | 1123 ++++++++---------
.../DataReceivingDocDataIn.aspx.designer.cs | 180 +--
.../DesignChangeOrderDataIn.aspx.cs | 13 +-
.../InspectionMachineDataIn.aspx.cs | 17 +-
.../InspectionPersonDataIn.aspx.cs | 18 +-
.../Comprehensive/NCRManagementDataIn.aspx.cs | 13 +-
.../File/Excel/DataIn/NCR管理导入模板.xls | Bin 20480 -> 20480 bytes
.../File/Excel/DataIn/人员报验导入模板.xls | Bin 20480 -> 19968 bytes
.../File/Excel/DataIn/机具报验导入模板.xls | Bin 20480 -> 19968 bytes
.../File/Excel/DataIn/设计变更单导入模板.xls | Bin 19456 -> 19968 bytes
.../DataIn/资料收发文登记记录导入模板.xls | Bin 0 -> 19968 bytes
.../DataIn/资料收发文登记记录导入模板.xlsx | Bin 10494 -> 0 bytes
SGGL/Model/Model.cs | 120 ++
22 files changed, 765 insertions(+), 969 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql
create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xls
delete mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/资料收发文登记记录导入模板.xlsx
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql
new file mode 100644
index 00000000..a715e653
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-22-bwj.sql
@@ -0,0 +1,7 @@
+
+alter table Comprehensive_InspectionPerson add RemarkCode nvarchar(50)
+alter table Comprehensive_InspectionMachine add RemarkCode nvarchar(50)
+alter table Comprehensive_DesignChangeOrder add RemarkCode nvarchar(50)
+alter table Comprehensive_NCRManagement add RemarkCode nvarchar(50)
+alter table Comprehensive_DataReceivingDoc add RemarkCode nvarchar(50)
+
diff --git a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
index 9dac14b5..d199e432 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DataReceivingDocService.cs
@@ -65,6 +65,7 @@ namespace BLL
CompileDate = doc.CompileDate,
Status = doc.Status,
AuditMan = doc.AuditMan,
+ RemarkCode = doc.RemarkCode
};
Funs.DB.Comprehensive_DataReceivingDoc.InsertOnSubmit(newDoc);
Funs.DB.SubmitChanges();
diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
index d53ea1f7..8003bf0f 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DesignChangeOrderService.cs
@@ -197,6 +197,7 @@ namespace BLL
newDesignChangeOrder.CompileDate = desginChangeOrder.CompileDate;
newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
newDesignChangeOrder.Status = desginChangeOrder.Status;
+ newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode;
db.Comprehensive_DesignChangeOrder.InsertOnSubmit(newDesignChangeOrder);
db.SubmitChanges();
}
@@ -225,6 +226,7 @@ namespace BLL
newDesignChangeOrder.ImplementationFrontState = desginChangeOrder.ImplementationFrontState;
newDesignChangeOrder.CompleteDate = desginChangeOrder.CompleteDate;
newDesignChangeOrder.Status = desginChangeOrder.Status;
+ newDesignChangeOrder.RemarkCode = desginChangeOrder.RemarkCode;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
index ca1d601b..7d002b8d 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
@@ -128,6 +128,7 @@ namespace BLL
newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
newInspectionMachine.Status = inspectionMachine.Status;
+ newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
db.Comprehensive_InspectionMachine.InsertOnSubmit(newInspectionMachine);
db.SubmitChanges();
}
@@ -159,6 +160,7 @@ namespace BLL
newInspectionMachine.UnitsCount = inspectionMachine.UnitsCount;
newInspectionMachine.LeaveDate = inspectionMachine.LeaveDate;
newInspectionMachine.Status = inspectionMachine.Status;
+ newInspectionMachine.RemarkCode = inspectionMachine.RemarkCode;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
index 179687e2..c31f907b 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
@@ -61,6 +61,7 @@ namespace BLL
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
newInspectionPerson.Status = inspectionPerson.Status;
newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
+ newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode;
db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson);
db.SubmitChanges();
}
@@ -92,6 +93,7 @@ namespace BLL
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
newInspectionPerson.Status = inspectionPerson.Status;
newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
+ newInspectionPerson.RemarkCode = inspectionPerson.RemarkCode;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
index ea7fe758..1e5b5755 100644
--- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs
@@ -118,6 +118,7 @@ namespace BLL
newNCRManagement.Status = nCRManagement.Status;
newNCRManagement.Problem = nCRManagement.Problem;
newNCRManagement.Measure = nCRManagement.Measure;
+ newNCRManagement.RemarkCode = nCRManagement.RemarkCode;
db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement);
db.SubmitChanges();
}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 841ddca2..69a4d707 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3244,7 +3244,7 @@ namespace BLL
///
/// 资料收发文登记记录导入模板原始虚拟路径
///
- public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx";
+ public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xls";
///
/// 培训记录导入模板原始虚拟路径
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
index 02d5d8a7..0a2e1e10 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
@@ -156,7 +156,7 @@
+ Width="700px" Height="560px">
<%--
导入资料收发文登记记录
-
-
-
-