Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right" LabelWidth="120px"
|
||||
MaxLength="50">
|
||||
>
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
||||
@@ -561,19 +561,22 @@ namespace FineUIPro.Web.CQMS.Solution
|
||||
else
|
||||
{
|
||||
constructSolution.State = Const.CQMSConstructSolution_Compile;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(HFConstructSolutionId.Text))
|
||||
}
|
||||
constructSolution.CompileMan = CurrUser.UserId;
|
||||
constructSolution.Edition = Convert.ToInt32(txtEdition.Text);
|
||||
if (!string.IsNullOrEmpty(ConstructSolutionId))
|
||||
{
|
||||
constructSolution.ConstructSolutionId = HFConstructSolutionId.Text;
|
||||
CQMSConstructSolutionService.UpdateConstructSolution(constructSolution);
|
||||
}
|
||||
else
|
||||
{
|
||||
constructSolution.ConstructSolutionId = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolution));
|
||||
CQMSConstructSolutionService.AddConstructSolution(constructSolution);
|
||||
}
|
||||
constructSolution.CompileMan = CurrUser.UserId;
|
||||
constructSolution.Edition = Convert.ToInt32(txtEdition.Text);
|
||||
|
||||
|
||||
CQMSConstructSolutionService.AddConstructSolution(constructSolution);
|
||||
|
||||
if (saveType == "submit")
|
||||
{
|
||||
Model.Solution_CQMSConstructSolutionApprove approve1 = new Model.Solution_CQMSConstructSolutionApprove();
|
||||
|
||||
Reference in New Issue
Block a user