gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
高飞
2026-08-10 17:17:52 +08:00
parent 5ffee659f4
commit 66db11bdb4
9 changed files with 119 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/BLL/API/APIBaseServices.cs
+4 -4
View File
@@ -242,13 +242,13 @@ namespace BLL.API
return respone; return respone;
} }
public static Model.ResponeData weldSilkList() public static Model.ResponeData weldSilkList(string str)
{ {
Model.ResponeData respone = new ResponeData(); Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var q = from x in db.View_WeldInfoDropDownLists var q = from x in db.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊丝") where x.WeldTypeName.Contains("焊丝") && x.WeldName.Contains(str)
select x; select x;
List<WeldInfoItem> res = new List<WeldInfoItem>(); List<WeldInfoItem> res = new List<WeldInfoItem>();
foreach (var p in q) foreach (var p in q)
@@ -264,13 +264,13 @@ namespace BLL.API
return respone; return respone;
} }
public static Model.ResponeData weldMatList() public static Model.ResponeData weldMatList(string str)
{ {
Model.ResponeData respone = new ResponeData(); Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{ {
var q = from x in db.View_WeldInfoDropDownLists var q = from x in db.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊条") where x.WeldTypeName.Contains("焊条") && x.WeldName.Contains(str)
select x; select x;
List<WeldInfoItem> res = new List<WeldInfoItem>(); List<WeldInfoItem> res = new List<WeldInfoItem>();
foreach (var p in q) foreach (var p in q)
HJGL_DS/BLL/API/APIJointInfoService.cs
+11 -3
View File
@@ -254,9 +254,9 @@ namespace BLL
//newJointInfo.JOT_JointAttribute = newJointInfo.JOT_JointAttribute; //newJointInfo.JOT_JointAttribute = newJointInfo.JOT_JointAttribute;
newJointInfo.JOT_Location = addItem.JOT_Location; newJointInfo.JOT_Location = addItem.JOT_Location;
//newJointInfo.JOT_Sch = newJointInfo.JOT_Sch; //newJointInfo.JOT_Sch = newJointInfo.JOT_Sch;
//newJointInfo.WME_ID = item.WME_ID; newJointInfo.WME_ID = addItem.WME_ID;
//newJointInfo.JOT_WeldMat = item.JOT_WeldMat; newJointInfo.JOT_WeldMat = addItem.JOT_WeldMat;
//newJointInfo.JOT_WeldSilk = item.JOT_WeldSilk; newJointInfo.JOT_WeldSilk = addItem.JOT_WeldSilk;
//if (item.JOT_Dia.HasValue) //if (item.JOT_Dia.HasValue)
//{ //{
@@ -424,6 +424,10 @@ namespace BLL
strSql += " AND TestPackage =@TestPackage"; strSql += " AND TestPackage =@TestPackage";
listStr.Add(new SqlParameter("@TestPackage", newJointInfo.PressureTestPackageNo)); listStr.Add(new SqlParameter("@TestPackage", newJointInfo.PressureTestPackageNo));
} }
if (newJointInfo.IsGold == true) //黄金口单独组批
{
strSql += " AND IsGold =1";
}
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable batchInfo = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable batchInfo = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -460,6 +464,10 @@ namespace BLL
batch.SER_ID = isoInfo.SER_ID; batch.SER_ID = isoInfo.SER_ID;
batch.TestPackage = newJointInfo.PressureTestPackageNo; batch.TestPackage = newJointInfo.PressureTestPackageNo;
batch.BatchStartDate = addItem.WeldDate; batch.BatchStartDate = addItem.WeldDate;
if (newJointInfo.IsGold == true) //黄金口单独组批
{
batch.IsGold = true;
}
BLL.HJGL_BO_BatchService.AddBatch(batch); BLL.HJGL_BO_BatchService.AddBatch(batch);
} }
else else
HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
+1
View File
@@ -1391,6 +1391,7 @@ namespace BLL
newWeldReportItem.JOT_ID = jotInfo.JOT_ID; newWeldReportItem.JOT_ID = jotInfo.JOT_ID;
newWeldReportItem.JOT_JointNo = jotInfo.JOT_JointNo; newWeldReportItem.JOT_JointNo = jotInfo.JOT_JointNo;
newWeldReportItem.ProjectId = jotInfo.ProjectId; newWeldReportItem.ProjectId = jotInfo.ProjectId;
newWeldReportItem.DReportID = jotInfo.DReportID;
var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(jotInfo.ISO_ID); var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(jotInfo.ISO_ID);
if (isoInfo != null) if (isoInfo != null)
{ {
HJGL_DS/FineUIPro.Web/Web.config
+1 -1
View File
@@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
HJGL_DS/Model/APIItem/JointInfoItem.cs
+26 -1
View File
@@ -103,7 +103,14 @@ namespace Model
get; get;
set; set;
} }
/// <summary>
/// 焊接方法id
/// </summary>
public string WME_ID
{
get;
set;
}
/// <summary> /// <summary>
/// 焊接方法 /// 焊接方法
/// </summary> /// </summary>
@@ -210,5 +217,23 @@ namespace Model
get; get;
set; set;
} }
/// <summary>
/// 焊条Id
/// </summary>
public string JOT_WeldMat
{
get;
set;
}
/// <summary>
/// 焊丝Id
/// </summary>
public string JOT_WeldSilk
{
get;
set;
}
} }
} }
HJGL_DS/Model/HJGL/HJGL_SpRpWeldReportItem.cs
+8
View File
@@ -59,6 +59,14 @@ namespace Model
set; set;
} }
/// <summary> /// <summary>
/// 日报id
/// </summary>
public string DReportID
{
get;
set;
}
/// <summary>
/// 项目号 /// 项目号
/// </summary> /// </summary>
public string ProjectCode public string ProjectCode
HJGL_DS/WebAPI/Controllers/BaseController.cs
+6 -6
View File
@@ -219,13 +219,13 @@ namespace WebAPI.Controllers
} }
[HttpGet] [HttpGet]
public Model.ResponeData weldSilkList() public Model.ResponeData weldSilkList(string str)
{ {
Model.ResponeData respone = new ResponeData(); Model.ResponeData respone = new ResponeData();
try try
{ {
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.weldSilkList(); return APIBaseServices.weldSilkList(s);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -236,13 +236,13 @@ namespace WebAPI.Controllers
} }
[HttpGet] [HttpGet]
public Model.ResponeData weldMatList() public Model.ResponeData weldMatList(string str)
{ {
Model.ResponeData respone = new ResponeData(); Model.ResponeData respone = new ResponeData();
try try
{ {
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.weldMatList(); return APIBaseServices.weldMatList(s);
} }
catch (Exception e) catch (Exception e)
{ {
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
+38 -5
View File
@@ -105,28 +105,34 @@ namespace WebAPI.Controllers
addItem.ProjectId = joint.ProjectId; addItem.ProjectId = joint.ProjectId;
} }
} }
var cellWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_Code == addItem.JOT_CellWelder); var cellWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_ID == addItem.JOT_CellWelderID);
if (!string.IsNullOrEmpty(addItem.JOT_CellWelderID))
{
if (cellWelderMan == null) if (cellWelderMan == null)
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = "焊工号" + addItem.JOT_CellWelder + "不存在！"; responeData.message = "焊工" + addItem.JOT_CellWelder + "不存在！";
return responeData; return responeData;
} }
else else
{ {
addItem.JOT_CellWelderID = cellWelderMan.WED_ID; addItem.JOT_CellWelderID = cellWelderMan.WED_ID;
} }
var floorWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_Code == addItem.JOT_FloorWelder); }
var floorWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_ID == addItem.JOT_FloorWelderID);
if (!string.IsNullOrEmpty(addItem.JOT_FloorWelderID))
{
if (floorWelderMan == null) if (floorWelderMan == null)
{ {
responeData.code = 0; responeData.code = 0;
responeData.message = "焊工号" + addItem.JOT_FloorWelder + "不存在！"; responeData.message = "焊工" + addItem.JOT_FloorWelder + "不存在！";
return responeData; return responeData;
} }
else else
{ {
addItem.JOT_FloorWelderID = floorWelderMan.WED_ID; addItem.JOT_FloorWelderID = floorWelderMan.WED_ID;
} }
}
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", addItem.ProjectId); var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", addItem.ProjectId);
if (batchC == null) if (batchC == null)
{ {
@@ -137,9 +143,10 @@ namespace WebAPI.Controllers
var weldMethod = db.HJGL_BS_WeldMethod.FirstOrDefault(x => x.WME_ID == joint.WME_ID); var weldMethod = db.HJGL_BS_WeldMethod.FirstOrDefault(x => x.WME_ID == joint.WME_ID);
var locationItem = BLL.DropListService.HJGL_JOT_LocationItem().FirstOrDefault(x => x.Text == addItem.JOT_Location); var locationItem = BLL.DropListService.HJGL_JOT_LocationItem().FirstOrDefault(x => x.Text == addItem.JOT_Location);
var welderQualifiedProjects = from x in db.HJGL_BS_WelderQualifiedProject select x; var welderQualifiedProjects = from x in db.HJGL_BS_WelderQualifiedProject select x;
bool canSave = false; bool canSave = false, isTwoWelder = false;
if (!string.IsNullOrEmpty(joint.JOTY_ID) && cellWelderMan != null && floorWelderMan != null && weldMethod != null && locationItem != null) if (!string.IsNullOrEmpty(joint.JOTY_ID) && cellWelderMan != null && floorWelderMan != null && weldMethod != null && locationItem != null)
{ {
isTwoWelder = true;
var joty = db.HJGL_BS_JointType.FirstOrDefault(x => x.JOTY_ID == joint.JOTY_ID); var joty = db.HJGL_BS_JointType.FirstOrDefault(x => x.JOTY_ID == joint.JOTY_ID);
string weldType = joty.JOTY_Group; string weldType = joty.JOTY_Group;
string floorWelder = floorWelderMan.WED_ID; string floorWelder = floorWelderMan.WED_ID;
@@ -225,8 +232,34 @@ namespace WebAPI.Controllers
} }
} }
} }
if (isTwoWelder) //两个焊工全部选择后提交日报
{
BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem); BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem);
} }
else
{
var newJointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(addItem.JOT_ID);
newJointInfo.JOT_JointStatus = "100";
if (!string.IsNullOrEmpty(addItem.JOT_CellWelderID))
{
newJointInfo.JOT_CellWelder = addItem.JOT_CellWelderID;
}
if (!string.IsNullOrEmpty(addItem.JOT_FloorWelderID))
{
newJointInfo.JOT_FloorWelder = addItem.JOT_FloorWelderID;
}
newJointInfo.JOT_DoneDin = newJointInfo.JOT_Size;
newJointInfo.JOT_Location = addItem.JOT_Location;
newJointInfo.WME_ID = addItem.WME_ID;
newJointInfo.JOT_WeldMat = addItem.JOT_WeldMat;
newJointInfo.JOT_WeldSilk = addItem.JOT_WeldSilk;
if (newJointInfo.WeldL.HasValue)
{
newJointInfo.JOT_JointDesc = "L=" + newJointInfo.WeldL.Value.ToString();
}
BLL.HJGL_PW_JointInfoService.UpdateJointInfoByDReport(newJointInfo);
}
}
} }
catch (Exception ex) catch (Exception ex)
{ {
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+9 -9
View File
@@ -85,13 +85,13 @@
<publishTime>04/12/2024 09:54:20</publishTime> <publishTime>04/12/2024 09:54:20</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>08/07/2026 17:27:28</publishTime> <publishTime>08/10/2026 15:15:48</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/31/2025 16:32:37</publishTime> <publishTime>12/31/2025 16:32:37</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>08/07/2026 17:27:28</publishTime> <publishTime>08/10/2026 15:15:48</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime> <publishTime>12/17/2020 21:32:28</publishTime>
@@ -121,10 +121,10 @@
<publishTime>07/25/2012 11:48:56</publishTime> <publishTime>07/25/2012 11:48:56</publishTime>
</File> </File>
<File Include="bin/Model.dll"> <File Include="bin/Model.dll">
<publishTime>08/07/2026 17:27:27</publishTime> <publishTime>08/10/2026 15:15:48</publishTime>
</File> </File>
<File Include="bin/Model.pdb"> <File Include="bin/Model.pdb">
<publishTime>08/07/2026 17:27:27</publishTime> <publishTime>08/10/2026 15:15:48</publishTime>
</File> </File>
<File Include="bin/Newtonsoft.Json.dll"> <File Include="bin/Newtonsoft.Json.dll">
<publishTime>11/28/2018 02:07:34</publishTime> <publishTime>11/28/2018 02:07:34</publishTime>
@@ -295,13 +295,13 @@
<publishTime>05/24/2018 13:38:24</publishTime> <publishTime>05/24/2018 13:38:24</publishTime>
</File> </File>
<File Include="bin/SgManager.AI.dll"> <File Include="bin/SgManager.AI.dll">
<publishTime>08/07/2026 17:27:34</publishTime> <publishTime>08/10/2026 15:15:55</publishTime>
</File> </File>
<File Include="bin/SgManager.AI.dll.config"> <File Include="bin/SgManager.AI.dll.config">
<publishTime>07/28/2025 11:00:31</publishTime> <publishTime>07/28/2025 11:00:31</publishTime>
</File> </File>
<File Include="bin/SgManager.AI.pdb"> <File Include="bin/SgManager.AI.pdb">
<publishTime>08/07/2026 17:27:34</publishTime> <publishTime>08/10/2026 15:15:55</publishTime>
</File> </File>
<File Include="bin/System.Net.Http.Formatting.dll"> <File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>02/01/2018 12:17:18</publishTime> <publishTime>02/01/2018 12:17:18</publishTime>
@@ -337,10 +337,10 @@
<publishTime>06/29/2015 16:49:52</publishTime> <publishTime>06/29/2015 16:49:52</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>08/07/2026 17:27:36</publishTime> <publishTime>08/10/2026 15:15:57</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>08/07/2026 17:27:36</publishTime> <publishTime>08/10/2026 15:15:57</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime> <publishTime>01/23/2014 13:57:34</publishTime>
@@ -466,7 +466,7 @@
<publishTime>07/03/2024 11:01:07</publishTime> <publishTime>07/03/2024 11:01:07</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>08/07/2026 17:27:41</publishTime> <publishTime>08/10/2026 15:16:11</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>