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

11

This commit is contained in:
佘春生 2024-05-30 20:01:56 +08:00
parent ef6a39e24b
commit 062f48649b
10 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

Binary file not shown.

2
HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

2
HJGL/FineUIPro.Web/Web.config
View File

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections>
<connectionStrings>
<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
<add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
<!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />-->
</connectionStrings>

6
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/CheckManage.aspx.cs
View File

@ -734,15 +734,15 @@ namespace FineUIPro.Web.CheckManage
var jointInfo = db.Pipeline_WeldJoint.FirstOrDefault(x => x.WeldJointId == pointBatchItem.WeldJointId);
int k_num = 0;
string jot = "K1";
int indexK = jointInfo.WeldJointCode.LastIndexOf("K");
string jot = "EX1";
int indexK = jointInfo.WeldJointCode.LastIndexOf("EX");
if (indexK > 0)
{
try
{
k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
jot = "K" + k_num.ToString();
jot = "EX" + k_num.ToString();
}
catch { }
}

10
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs
View File

@ -573,19 +573,19 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
if (exp != null)
{
string exportTrustCode = string.Empty;
if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R2")
if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R2")
{
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2R2";
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2R2";
}
else
{
if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 4) == "K1R1")
if (repairRecord.RepairRecordCode.Substring(repairRecord.RepairRecordCode.Length - 5) == "EX1R1")
{
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "K2";
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 4) + "EX2";
}
else
{
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "K1";
exportTrustCode = repairRecord.RepairRecordCode.Substring(0, repairRecord.RepairRecordCode.Length - 2) + "EX1";
}
}

9
HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs
View File

@ -71,16 +71,17 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
}
else
{
if (code.Substring(code.Length - 2, 1) == "K")
if (code.Substring(code.Length - 3, 2) == "EX")
{
newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 2) + "-" + q.WeldJointCode + "K1R1";
newItem.RepairRecordCode = q.TrustBatchCode.Substring(0, code.Length - 3) + "-" + q.WeldJointCode + "EX1R1";
}
else
{
if (q.JudgeGrade == "修磨" || q.JudgeGrade == "异物")
if (q.Remark.Contains("修磨"))
{
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "M1";
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "P1";
}
else
{
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1";

2
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/PointManage.aspx.cs
View File

@ -1272,7 +1272,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
pointBatchItem.CutDate = System.DateTime.Now;////更新批明细 切除日期
Funs.DB.SubmitChanges();
BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C");
BLL.Batch_PointBatchService.UpdateNewKuoOrCutJointNo(pointBatchItem.PointBatchItemId, "C1");
// 更新批 是否委托：否
var updatePointBatch = BLL.Batch_PointBatchService.GetPointBatchById(this.PointBatchId);
if (updatePointBatch != null)

6
HJGL/FineUIPro.Web/WeldingProcess/TrustManage/SelectExpandPoint.aspx.cs
View File

@ -162,7 +162,7 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
db.SubmitChanges(); ////更新批明细 返修日期 状态
int k_num = 0;
string jot = "K1";
string jot = "EX1";
Model.Pipeline_WeldJoint jointInfo = null;
if (!String.IsNullOrEmpty(weldJointId))
@ -178,13 +178,13 @@ namespace FineUIPro.Web.WeldingProcess.TrustManage
}
}
int indexK = jointInfo.WeldJointCode.LastIndexOf("K");
int indexK = jointInfo.WeldJointCode.LastIndexOf("EX");
if (indexK > 0)
{
try
{
k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
jot = "K" + k_num.ToString();
jot = "EX" + k_num.ToString();
}
catch { }
}

2
HJGL/WebApi/WebApi.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>