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

11

This commit is contained in:
jackchenyang 2024-05-30 20:14:15 +08:00
parent 359228e24a 062f48649b
commit 9203802b9e
7 changed files with 20 additions and 19 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>
<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" />

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

@ -9,7 +9,7 @@
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/> <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
</configSections> </configSections>
<connectionStrings> <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" <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
providerName="System.Data.SqlClient" />--> providerName="System.Data.SqlClient" />-->
</connectionStrings> </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); var jointInfo = db.Pipeline_WeldJoint.FirstOrDefault(x => x.WeldJointId == pointBatchItem.WeldJointId);
int k_num = 0; int k_num = 0;
string jot = "K1"; string jot = "EX1";
int indexK = jointInfo.WeldJointCode.LastIndexOf("K"); int indexK = jointInfo.WeldJointCode.LastIndexOf("EX");
if (indexK > 0) if (indexK > 0)
{ {
try try
{ {
k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1; k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
jot = "K" + k_num.ToString(); jot = "EX" + k_num.ToString();
} }
catch { } catch { }
} }

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

@ -573,19 +573,19 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage
if (exp != null) if (exp != null)
{ {
string exportTrustCode = string.Empty; 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 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 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 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 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 else
{ {
newItem.RepairRecordCode = q.TrustBatchCode + "-" + q.WeldJointCode + "R1"; 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;////更新批明细 切除日期 pointBatchItem.CutDate = System.DateTime.Now;////更新批明细 切除日期
Funs.DB.SubmitChanges(); 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); var updatePointBatch = BLL.Batch_PointBatchService.GetPointBatchById(this.PointBatchId);
if (updatePointBatch != null) 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(); ////更新批明细 返修日期 状态 db.SubmitChanges(); ////更新批明细 返修日期 状态
int k_num = 0; int k_num = 0;
string jot = "K1"; string jot = "EX1";
Model.Pipeline_WeldJoint jointInfo = null; Model.Pipeline_WeldJoint jointInfo = null;
if (!String.IsNullOrEmpty(weldJointId)) 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) if (indexK > 0)
{ {
try try
{ {
k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1; k_num = Convert.ToInt32(jointInfo.WeldJointCode.Substring(indexK + 1, 1)) + 1;
jot = "K" + k_num.ToString(); jot = "EX" + k_num.ToString();
} }
catch { } catch { }
} }