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/WebAPI/Controllers/BaseController.cs
+6 -6
View File
@@ -219,13 +219,13 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData weldSilkList()
public Model.ResponeData weldSilkList(string str)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.weldSilkList();
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.weldSilkList(s);
}
catch (Exception e)
{
@@ -236,13 +236,13 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData weldMatList()
public Model.ResponeData weldMatList(string str)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.weldMatList();
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.weldMatList(s);
}
catch (Exception e)
{
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
+53 -20
View File
@@ -105,27 +105,33 @@ namespace WebAPI.Controllers
addItem.ProjectId = joint.ProjectId;
}
}
var cellWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_Code == addItem.JOT_CellWelder);
if (cellWelderMan == null)
var cellWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_ID == addItem.JOT_CellWelderID);
if (!string.IsNullOrEmpty(addItem.JOT_CellWelderID))
{
responeData.code = 0;
responeData.message = "焊工号" + addItem.JOT_CellWelder + "不存在！";
return responeData;
if (cellWelderMan == null)
{
responeData.code = 0;
responeData.message = "焊工" + addItem.JOT_CellWelder + "不存在！";
return responeData;
}
else
{
addItem.JOT_CellWelderID = cellWelderMan.WED_ID;
}
}
else
var floorWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_ID == addItem.JOT_FloorWelderID);
if (!string.IsNullOrEmpty(addItem.JOT_FloorWelderID))
{
addItem.JOT_CellWelderID = cellWelderMan.WED_ID;
}
var floorWelderMan = db.HJGL_BS_Welder.FirstOrDefault(x => x.WED_Code == addItem.JOT_FloorWelder);
if (floorWelderMan == null)
{
responeData.code = 0;
responeData.message = "焊工号" + addItem.JOT_FloorWelder + "不存在！";
return responeData;
}
else
{
addItem.JOT_FloorWelderID = floorWelderMan.WED_ID;
if (floorWelderMan == null)
{
responeData.code = 0;
responeData.message = "焊工" + addItem.JOT_FloorWelder + "不存在！";
return responeData;
}
else
{
addItem.JOT_FloorWelderID = floorWelderMan.WED_ID;
}
}
var batchC = BLL.Project_SysSetService.GetSysSetBySetId("5", addItem.ProjectId);
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 locationItem = BLL.DropListService.HJGL_JOT_LocationItem().FirstOrDefault(x => x.Text == addItem.JOT_Location);
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)
{
isTwoWelder = true;
var joty = db.HJGL_BS_JointType.FirstOrDefault(x => x.JOTY_ID == joint.JOTY_ID);
string weldType = joty.JOTY_Group;
string floorWelder = floorWelderMan.WED_ID;
@@ -225,7 +232,33 @@ namespace WebAPI.Controllers
}
}
}
BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem);
if (isTwoWelder) //两个焊工全部选择后提交日报
{
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)
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+9 -9
View File
@@ -85,13 +85,13 @@
<publishTime>04/12/2024 09:54:20</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>08/07/2026 17:27:28</publishTime>
<publishTime>08/10/2026 15:15:48</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/31/2025 16:32:37</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>08/07/2026 17:27:28</publishTime>
<publishTime>08/10/2026 15:15:48</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime>
@@ -121,10 +121,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>08/07/2026 17:27:27</publishTime>
<publishTime>08/10/2026 15:15:48</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>08/07/2026 17:27:27</publishTime>
<publishTime>08/10/2026 15:15:48</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>11/28/2018 02:07:34</publishTime>
@@ -295,13 +295,13 @@
<publishTime>05/24/2018 13:38:24</publishTime>
</File>
<File Include="bin/SgManager.AI.dll">
<publishTime>08/07/2026 17:27:34</publishTime>
<publishTime>08/10/2026 15:15:55</publishTime>
</File>
<File Include="bin/SgManager.AI.dll.config">
<publishTime>07/28/2025 11:00:31</publishTime>
</File>
<File Include="bin/SgManager.AI.pdb">
<publishTime>08/07/2026 17:27:34</publishTime>
<publishTime>08/10/2026 15:15:55</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>02/01/2018 12:17:18</publishTime>
@@ -337,10 +337,10 @@
<publishTime>06/29/2015 16:49:52</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>08/07/2026 17:27:36</publishTime>
<publishTime>08/10/2026 15:15:57</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>08/07/2026 17:27:36</publishTime>
<publishTime>08/10/2026 15:15:57</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
@@ -466,7 +466,7 @@
<publishTime>07/03/2024 11:01:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>08/07/2026 17:27:41</publishTime>
<publishTime>08/10/2026 15:16:11</publishTime>
</File>
</ItemGroup>
</Project>