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-07 17:29:30 +08:00
parent 890db3efc8
commit 9a4a1ebfb8
9 changed files with 120 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/WebAPI/Controllers/BaseController.cs
+9 -9
View File
@@ -114,13 +114,13 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData baseTeamGroupList(string projectId, string unitId)
public Model.ResponeData baseTeamGroupList(string projectId, string unitId, string str)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.baseTeamGroupList(projectId, unitId);
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.baseTeamGroupList(projectId, unitId, s);
}
catch (Exception e)
{
@@ -132,13 +132,13 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData bsWelderList(string projectId)
public Model.ResponeData bsWelderList(string projectId,string str)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.bsWelderList(projectId);
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.bsWelderList(projectId,s);
}
catch (Exception e)
{
@@ -150,13 +150,13 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData unitStoreList()
public Model.ResponeData unitStoreList(string str)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.unitStoreList();
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
return APIBaseServices.unitStoreList(s);
}
catch (Exception e)
{
HJGL_DS/WebAPI/Controllers/UnitInfoController.cs
+3 -2
View File
@@ -41,12 +41,13 @@ namespace WebAPI.Controllers
/// <param name="projectId">施工Id</param>
/// <returns></returns>
[HttpGet]
public Model.ResponeData getUnitByProjectId(string projectId)
public Model.ResponeData getUnitByProjectId(string projectId,string str)
{
var responeData = new Model.ResponeData();
try
{
responeData.data = APIUnitInfoService.getUnitByProjectId(projectId);
string s = !string.IsNullOrEmpty(str) ? str : string.Empty;
responeData.data = APIUnitInfoService.getUnitByProjectId(projectId,s);
}
catch (Exception ex)
{
HJGL_DS/WebAPI/Controllers/WeldController.cs
+1 -1
View File
@@ -200,7 +200,7 @@ namespace WebAPI.Controllers
newTemp.InPutDate = DateTime.Now;
newTemp.OrderDate = DateTime.Now;
newTemp.OrderTime = usingPlan.OrderTime;
newTemp.TeamGroupId = usingPlan.TeamGroupId;
newTemp.TeamGroupId = usingPlan.TeamGroupName;
newTemp.CancelDate = BLL.Funs.GetNewDateTime(usingPlan.CancelDate);
newTemp.IsCancel = usingPlan.IsCancel;
newTemp.CancelResult = usingPlan.CancelResult;
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+12 -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 10:46:18</publishTime>
<publishTime>08/07/2026 17:27:28</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 10:46:18</publishTime>
<publishTime>08/07/2026 17:27:28</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 10:46:10</publishTime>
<publishTime>08/07/2026 17:27:27</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>08/07/2026 10:46:10</publishTime>
<publishTime>08/07/2026 17:27:27</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 10:46:25</publishTime>
<publishTime>08/07/2026 17:27:34</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 10:46:25</publishTime>
<publishTime>08/07/2026 17:27:34</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>02/01/2018 12:17:18</publishTime>
@@ -333,11 +333,14 @@
<File Include="bin/System.Web.WebPages.Razor.dll">
<publishTime>02/01/2018 12:20:56</publishTime>
</File>
<File Include="bin/ThoughtWorks.QRCode.dll">
<publishTime>06/29/2015 16:49:52</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>08/07/2026 10:46:32</publishTime>
<publishTime>08/07/2026 17:27:36</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>08/07/2026 10:46:32</publishTime>
<publishTime>08/07/2026 17:27:36</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
@@ -463,7 +466,7 @@
<publishTime>07/03/2024 11:01:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>08/07/2026 10:46:51</publishTime>
<publishTime>08/07/2026 17:27:41</publishTime>
</File>
</ItemGroup>
</Project>