shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: shecs:542c060f58f40d9caa0e87ead72498a48a78922a
Branches Tags
shecs:master
shecs:Feature_20240510
..
compare: shecs:e2a16d56fb6c10cee79cc383463c868c4720460b
Branches Tags
shecs:master
shecs:Feature_20240510

No commits in common. "542c060f58f40d9caa0e87ead72498a48a78922a" and "e2a16d56fb6c10cee79cc383463c868c4720460b" have entirely different histories.
542c060f58 ... e2a16d56fb

3 changed files with 5 additions and 18 deletions
Show Stats Expand all files Collapse all files

4
HJGL/.vs/HJGL/config/applicationhost.config
View File

@ -162,7 +162,7 @@
</site> </site>
<site name="WebApi" id="2"> <site name="WebApi" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" /> <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:3862:localhost" /> <binding protocol="http" bindingInformation="*:3862:localhost" />
@ -250,7 +250,7 @@
</site> </site>
<site name="FineUIPro.Web(10)" id="13"> <site name="FineUIPro.Web(10)" id="13">
<application path="/" applicationPool="Clr4IntegratedAppPool"> <application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" /> <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
</application> </application>
<bindings> <bindings>
<binding protocol="http" bindingInformation="*:13960:localhost" /> <binding protocol="http" bindingInformation="*:13960:localhost" />

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

19
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
View File

@ -911,11 +911,6 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
model.JointCode = jointCode; model.JointCode = jointCode;
model.CreatedTime = DateTime.Now; model.CreatedTime = DateTime.Now;
model.RowId = k; model.RowId = k;
model.UnitId = string.Empty;
model.InstallId = string.Empty;
model.WorkAreaId = string.Empty;
model.ProjectId = this.CurrUser.LoginProjectId;
model.PipelineId=string.Empty;
model.BatchNo = batchNo; model.BatchNo = batchNo;
string errorMsg = string.Empty; string errorMsg = string.Empty;
//验证是否为空 //验证是否为空
@ -944,13 +939,11 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{ {
errorMsg += "是否全部焊口未填写 | "; errorMsg += "是否全部焊口未填写 | ";
} }
//检查单位编号是否存在 //检查单位编号是否存在
var unitInfo = Funs.DB.Base_Unit.FirstOrDefault(t => t.UnitCode == model.UnitCode); var unitInfo = Funs.DB.Base_Unit.FirstOrDefault(t => t.UnitCode == model.UnitCode);
if (unitInfo == null) if (unitInfo == null)
{ {
errorMsg += "未知的单位编号 | "; errorMsg += "未知的单位编号 | ";
} }
var installInfo = Funs.DB.Project_Installation.FirstOrDefault(t => t.InstallationCode == model.InstallCode); var installInfo = Funs.DB.Project_Installation.FirstOrDefault(t => t.InstallationCode == model.InstallCode);
if (installInfo == null) if (installInfo == null)
@ -982,22 +975,16 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
} }
if (unitInfo != null && installInfo != null && areaInfo != null ) if (unitInfo != null && installInfo != null && areaInfo != null )
{ {
model.ProjectId=this.CurrUser.LoginProjectId;
model.UnitId = unitInfo.UnitId; model.UnitId = unitInfo.UnitId;
model.WorkAreaId = areaInfo.WorkAreaId; model.WorkAreaId = areaInfo.WorkAreaId;
model.InstallId = installInfo.InstallationId; model.InstallId = installInfo.InstallationId;
var newPipelineInfo = Funs.DB.Pipeline_Pipeline.FirstOrDefault(t => t.UnitId == unitInfo.UnitId && var newPipelineInfo = Funs.DB.Pipeline_Pipeline.FirstOrDefault(t => t.UnitId == unitInfo.UnitId &&
t.InstallationId == installInfo.InstallationId && t.WorkAreaId == areaInfo.WorkAreaId && t.InstallationId == installInfo.InstallationId && t.WorkAreaId == areaInfo.WorkAreaId &&
t.PipelineCode==model.PiplineCode); t.PipelineCode==model.PiplineCode);
if (newPipelineInfo != null)
if (newPipelineInfo == null)
{ {
errorMsg += "当前区域下不存在此管线号 | "; model.PipelineId =newPipelineInfo.PipelineId;
model.PipelineId = string.Empty;
}
else
{
model.PipelineId = newPipelineInfo.PipelineId;
var ptpDetailList = Funs.DB.PTP_PipelineList var ptpDetailList = Funs.DB.PTP_PipelineList
.Where(t => t.PipelineId == newPipelineInfo.PipelineId); .Where(t => t.PipelineId == newPipelineInfo.PipelineId);