20240531 质量策划
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GeneralPlanApprovalDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.GeneralPlanApprovalDataIn" %>
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GeneralPlanApprovalDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.GeneralPlanApprovalDataIn" ValidateRequest="false" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GeneralPlanApprovalEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.GeneralPlanApprovalEdit" %>
|
||||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="GeneralPlanApprovalEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.GeneralPlanApprovalEdit" ValidateRequest="false" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
generalPlanApproval.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
|
||||
}
|
||||
generalPlanApproval.PlanCode = this.txtPlanCode.Text.Trim();
|
||||
generalPlanApproval.PlanName = this.txtPlanName.Text.Trim();
|
||||
generalPlanApproval.PlanName = this.txtPlanName.Text.Trim().ToString();
|
||||
if (!string.IsNullOrEmpty(this.txtApprovalDate.Text))
|
||||
{
|
||||
generalPlanApproval.ApprovalDate = Convert.ToDateTime(this.txtApprovalDate.Text);
|
||||
|
||||
@@ -330,7 +330,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
return;
|
||||
}
|
||||
|
||||
var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null)));
|
||||
var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null)));
|
||||
if (q != null)
|
||||
{
|
||||
Alert.ShowInTop("标志编号已存在!", MessageBoxIcon.Warning);
|
||||
|
||||
@@ -296,6 +296,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
|
||||
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
|
||||
inspectionMachone.UnitsCount = Funs.GetNewInt(this.txtUnitsCount.Text.Trim());
|
||||
inspectionMachone.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
|
||||
{
|
||||
inspectionMachone.AuditMan = drpAudit.SelectedValue;
|
||||
|
||||
@@ -395,6 +395,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
|
||||
}
|
||||
nCRManagement.ReceiveUnit = unitIds;
|
||||
nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
|
||||
if (string.IsNullOrEmpty(this.NCRManagementId))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
|
||||
|
||||
Reference in New Issue
Block a user