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

Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

This commit is contained in:
毕文静 2025-08-04 11:09:46 +08:00
parent b4fe026d32 00a98811a4
commit c5d5957020
100 changed files with 95195 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -23,3 +23,10 @@ bin-release/
/HJGL_DS/.vs/config/applicationhost.config
/HJGL_DS/FineUIPro.Web/FileUpload/Sign
/sh.exe.stackdump
/HJGL_DS/FineUIPro.Web/.vs
/HJGL_DS/SgManager.AI/.vs
/HJGL_DS/packages
/HJGL_DSPackFile/PackFile
/HJGL_DSPackFile/版本日志
/HJGL_DS/FineUIPro.Web/FileUpload/FaceRecognition
/HJGL_DS/WebAPI/.vs

2
DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql Normal file
View File

@ -0,0 +1,2 @@
alter table [dbo].[Weld_UsingPlan] add UnitStoreId nvarchar(50) null
GO

2
DataBase/版本日志/HJGLDB_DS_2025-07-24_gf.sql Normal file
View File

@ -0,0 +1,2 @@
alter table Weld_WeldInfo add IsLock bit null
GO

2
DataBase/版本日志/HJGLDB_DS_2025-07-27_gf.sql Normal file
View File

@ -0,0 +1,2 @@
alter table HJGL_BS_Welder add PhotoUrl nvarchar(200) null
GO

2
DataBase/版本日志/HJGLDB_DS_2025-07-30_gf.sql Normal file
View File

@ -0,0 +1,2 @@
alter table Sys_User add IdCard nvarchar(50) null;
GO

32
HJGL_DS/BLL/API/APIBaseServices.cs
View File

@ -156,12 +156,19 @@ namespace BLL.API
}
return respone;
}
public static Model.ResponeData weldInfoList(string weldName, int page, int pageSize)
public static Model.ResponeData weldInfoList(string weldName, string unitStoreId, int page, int pageSize)
{
Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = (from x in db.Weld_WeldInfo orderby x.WeldCode select x).ToList();
if (!string.IsNullOrEmpty(unitStoreId))
{
q = (from x in db.Weld_WeldInfo
where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == x.WeldId select y.Amount ?? 0).Sum() > 0 && (x.IsLock == null || x.IsLock == false)
orderby x.WeldCode
select x).ToList();
}
if (!string.IsNullOrEmpty(weldName))
{
q = q.Where(x => x.WeldName.Contains(weldName)).ToList();
@ -344,6 +351,29 @@ namespace BLL.API
}
return respone;
}
public static Model.ResponeData unitStoreList()
{
Model.ResponeData respone = new ResponeData();
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in Funs.DB.Weld_UnitStore
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
orderby y.UnitName, x.UnitStoreCode
select new { x.UnitStoreId, UnitStoreName = x.UnitStoreName, y.UnitName, x.UnitId };
List<BaseTeamgroupItem> res = new List<BaseTeamgroupItem>();
foreach (var p in q)
{
BaseTeamgroupItem item = new BaseTeamgroupItem();
item.TeamGroupId = p.UnitStoreId;
item.TeamGroupName = p.UnitStoreName;
res.Add(item);
}
respone.data = res;
}
return respone;
}
public static Model.ResponeData bsWelderList(string projectId)
{
Model.ResponeData respone = new ResponeData();

4
HJGL_DS/BLL/API/APIWeldServices.cs
View File

@ -109,6 +109,7 @@ namespace BLL.API
UsingPlanItem planItem = new UsingPlanItem();
planItem.UsingPlanId = x.UsingPlanId;
planItem.WeldId = x.WeldId;
planItem.UnitStoreId= BLL.UnitStoreService.GetUnitStoreNameById(x.UnitStoreId);
planItem.ProjectId = x.ProjectId;
planItem.UsePosition = x.UsePosition;
planItem.Amount = x.Amount;
@ -253,7 +254,7 @@ namespace BLL.API
planItem.STE_ID = usingPlan.STE_ID;
planItem.IsFinish = usingPlan.IsFinish;
planItem.STE_Name = usingPlan.STE_Name;
planItem.UnitStoreId = BLL.UnitStoreService.GetUnitStoreNameById(usingPlan.UnitStoreId);
if (!string.IsNullOrEmpty(planItem.ProjectId))
{
@ -361,6 +362,7 @@ namespace BLL.API
newUsingPlan.WeldId = usingPlan.WeldId;
newUsingPlan.ProjectId = usingPlan.ProjectId;
newUsingPlan.UsePosition = usingPlan.UsePosition;
newUsingPlan.UnitStoreId = usingPlan.UnitStoreId;
newUsingPlan.Amount = usingPlan.Amount;
newUsingPlan.UsingManOne = usingPlan.UsingManOne;
newUsingPlan.UsingManTwo = usingPlan.UsingManTwo;

4
HJGL_DS/BLL/BLL.csproj
View File

@ -74,8 +74,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\Microsoft.SQLServer.ManagedDTS.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\FineUIPro\Net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>

2
HJGL_DS/BLL/DropListService.cs
View File

@ -660,7 +660,7 @@
/// <returns></returns>
public static ListItem[] OrderTimeList()
{
ListItem[] lis = new ListItem[15];
ListItem[] lis = new ListItem[14];
//DateTime dd = Convert.ToDateTime("7:00").AddDays(1);
DateTime? dd = null;
for (int i = 0; i < 14; i++)

42
HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs
View File

@ -113,5 +113,47 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
public static void InitUnitStoreDropDownList2(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
{
var store = from x in Funs.DB.Weld_UnitStore
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
orderby y.UnitName, x.UnitStoreCode
select new { x.UnitStoreId, UnitStoreName = x.UnitStoreName, y.UnitName, x.UnitId };
if (!string.IsNullOrEmpty(unitId))
{
store = store.Where(x => x.UnitId == unitId);
}
dropName.DataValueField = "UnitStoreId";
dropName.DataTextField = "UnitStoreName";
dropName.DataGroupField = "UnitName";
dropName.DataSource = store.ToList();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据主键获取单位仓库
/// </summary>
/// <param name="specificationsId"></param>
/// <returns></returns>
public static string GetUnitStoreNameById(string unitStoreId)
{
string name = string.Empty;
var store = from x in Funs.DB.Weld_UnitStore
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
where x.UnitStoreId== unitStoreId
orderby y.UnitName, x.UnitStoreCode
select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + x.UnitStoreName + ")"), y.UnitName, x.UnitId };
if (store.Count() > 0)
{
name = store.First().UnitStoreName;
}
return name;
}
}
}

2
HJGL_DS/BLL/WeldMat/BaseInfo/WeldInfoService.cs
View File

@ -35,6 +35,7 @@ namespace BLL
newWeld.WarnAmount = weld.WarnAmount;
newWeld.SteelType = weld.SteelType;
newWeld.CreateMan = weld.CreateMan;
newWeld.IsLock = weld.IsLock;
db.Weld_WeldInfo.InsertOnSubmit(newWeld);
db.SubmitChanges();
}
@ -57,6 +58,7 @@ namespace BLL
newWeld.WarnAmount = weld.WarnAmount;
newWeld.SteelType = weld.SteelType;
newWeld.ModifyMan = weld.ModifyMan;
newWeld.IsLock = weld.IsLock;
db.SubmitChanges();
}
}

2
HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanService.cs
View File

@ -49,6 +49,7 @@ namespace BLL
newUsingPlan.InPutMan = usingPlan.InPutMan;
newUsingPlan.IsSteelStru = usingPlan.IsSteelStru;
newUsingPlan.Type = usingPlan.Type;
newUsingPlan.UnitStoreId = usingPlan.UnitStoreId;
db.Weld_UsingPlan.InsertOnSubmit(newUsingPlan);
db.SubmitChanges();
@ -83,6 +84,7 @@ namespace BLL
newUsingPlan.IsSubmit = usingPlan.IsSubmit;
newUsingPlan.InPutMan = usingPlan.InPutMan;
newUsingPlan.IsSteelStru = usingPlan.IsSteelStru;
newUsingPlan.UnitStoreId = usingPlan.UnitStoreId;
db.SubmitChanges();
}

2
HJGL_DS/BLL/app.config
View File

@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>

2
HJGL_DS/BLL/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" requireReinstallation="true" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
<package id="NPOI" version="2.5.5" targetFramework="net461" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
<package id="SharpZipLib" version="1.3.2" targetFramework="net461" />

33
HJGL_DS/FineUIPro.Web/ErrLog.txt
View File

@ -61,3 +61,36 @@ IP地址:::1
出错时间:07/08/2025 16:56:56
出错时间:07/08/2025 16:56:56
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web._default.Page_Init(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\default.aspx.cs:行号 114
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.Web.UI.Control.OnInit(EventArgs e)
在 System.Web.UI.Page.OnInit(EventArgs e)
在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 135
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:07/24/2025 16:12:09
出错文件:http://localhost:64304/default.aspx
IP地址:::1
出错时间:07/24/2025 16:12:09
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 121
在 System.Web.UI.Control.InitRecursive(Control namingContainer)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:07/28/2025 11:13:06
出错文件:http://localhost:64304/WeldMat/UsingSentMat/WelderUsing.aspx
IP地址:::1
操作人员:管理员
出错时间:07/28/2025 11:13:06

BIN
HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx
View File

Binary file not shown.

19
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -81,7 +81,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\FastReport.Web.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=3.6.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
@ -90,9 +90,8 @@
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.JScript" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Net40\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@ -1336,6 +1335,7 @@
<Content Include="WeldMat\UsingPlan\UsingPlanImport.aspx" />
<Content Include="WeldMat\UsingPlan\UsingPlanImport2.aspx" />
<Content Include="WeldMat\UsingSentMat\CodeConfirm.aspx" />
<Content Include="WeldMat\UsingSentMat\FaceRecognition.aspx" />
<Content Include="WeldMat\UsingSentMat\LC700.aspx" />
<Content Include="WeldMat\UsingSentMat\ModityWeld.aspx" />
<Content Include="WeldMat\UsingSentMat\ShowReturnMat.aspx" />
@ -6962,6 +6962,13 @@
<Compile Include="WeldMat\UsingSentMat\CodeConfirm.aspx.designer.cs">
<DependentUpon>CodeConfirm.aspx</DependentUpon>
</Compile>
<Compile Include="WeldMat\UsingSentMat\FaceRecognition.aspx.cs">
<DependentUpon>FaceRecognition.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldMat\UsingSentMat\FaceRecognition.aspx.designer.cs">
<DependentUpon>FaceRecognition.aspx</DependentUpon>
</Compile>
<Compile Include="WeldMat\UsingSentMat\LC700.aspx.cs">
<DependentUpon>LC700.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -7447,6 +7454,10 @@
<Project>{FD1E1931-1688-4B4A-BCD6-335A81465343}</Project>
<Name>Model</Name>
</ProjectReference>
<ProjectReference Include="..\SgManager.AI\SgManager.AI.csproj">
<Project>{55f4e1e2-5fb3-4ab4-b692-432ce41b3e61}</Project>
<Name>SgManager.AI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="aspnet_client\FreeTextBox\images\misc\buttonbackgrounds.psd" />

35
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<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="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@ -23,6 +23,22 @@
<!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
<add key="SystemCode" value="HJCLGL"/>
<add key="http" value="http://localhost/test/"/>
<!--BAIDU AI配置-->
<add key="APP_ID" value="119624563"/>
<add key="API_KEY" value="qm0iFO9OTHqx5dt5dNIKuvIE"/>
<add key="SECRET_KEY" value="NwA68AnLM9SwEcbB2ONCu6cagy2czzVc"/>
<!--人脸检测参数-->
<!--人脸活体检测参数1最好，0最差 建议0.995 -->
<add key="BD_face_liveness" value="0.3"/>
<!--人脸高宽建议100-200-->
<!--<add key="BD_width" value="200" />-->
<!--<add key="BD_height" value="200" />-->
<!--人脸角度-->
<add key="BD_roll" value="40"/>
<!--人脸遮档度0最好，1最不好-->
<add key="BD_occlusion" value="1"/>
<!--人脸模糊度0最好，1最不好-->
<add key="BD_blur" value="0.1"/>
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@ -44,7 +60,9 @@
</pages>
<httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
</httpModules>
<add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
</httpModules>
<httpHandlers>
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
@ -143,4 +161,17 @@
</wsHttpBinding>
</bindings>
</system.serviceModel>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

1
HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/WeldInfo.aspx
View File

@ -124,6 +124,7 @@
<f:NumberBox ID="txtWarnAmount" runat="server" Label="最低警示数量" LabelAlign="Right"
NoNegative="true" NoDecimal="false" LabelWidth="140px">
</f:NumberBox>
<f:CheckBox runat="server" ID="cbIsLock" Label="冻结" LabelWidth="140px" LabelAlign="Right"></f:CheckBox>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">

17
HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/WeldInfo.aspx.cs
View File

@ -274,6 +274,14 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
{
this.txtWarnAmount.Text = weldInfo.WarnAmount.ToString();
}
if (weldInfo.IsLock == true)
{
this.cbIsLock.Checked = true;
}
else
{
this.cbIsLock.Checked = false;
}
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
}
@ -348,7 +356,14 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
//{
// weld.WarnAmount = 20;
//}
if (this.cbIsLock.Checked)
{
weld.IsLock = true;
}
else
{
weld.IsLock = null;
}
if (string.IsNullOrEmpty(strRowID))
{
strRowID = SQLHelper.GetNewID(typeof(Model.Weld_WeldInfo));

9
HJGL_DS/FineUIPro.Web/WeldMat/BaseInfo/WeldInfo.aspx.designer.cs generated
View File

@ -210,6 +210,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo {
/// </remarks>
protected global::FineUIPro.NumberBox txtWarnAmount;
/// <summary>
/// cbIsLock 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsLock;
/// <summary>
/// Toolbar1 控件。
/// </summary>

21
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs
View File

@ -53,9 +53,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
WeldType.WeldTypeName,WeldType.WeldUnit
FROM dbo.Weld_WeldInfo weld
LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId
WHERE 1 = 1 ";
WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
//and (select (SUM(ISNULL(stockIn.Amount,0))-SUM(ISNULL(stockIn.UsingAmount,0))) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
List<SqlParameter> listStr = new List<SqlParameter>();
//listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
listStr.Add(new SqlParameter("@UnitStoreId", Request.Params["unitStoreId"]));
if (drpWeldType.SelectedValue != BLL.Const._Null)
{
strSql += " AND weld.WeldTypeId = @WeldTypeId";
@ -156,7 +159,17 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
string itemsString = this.Grid1.SelectedRowID;
Model.SGGLDB db = Funs.DB;
string unitStoreId = Request.Params["unitStoreId"];
var q = from x in db.Weld_WeldInfo
where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == itemsString select y.Amount ?? 0).Sum() - (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == itemsString select y.UsingAmount ?? 0).Sum() + (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == itemsString select y.RecycleAmount ?? 0).Sum() > 0 && (x.IsLock == null || x.IsLock == false)
orderby x.WeldCode
select x;
if (q.Count() == 0)
{
Alert.ShowInTop("所选焊材无库存，请联系仓库保管员！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(itemsString)
+ ActiveWindow.GetHidePostBackReference());
}
@ -177,13 +190,13 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (WeldId != null)
{
var usingMat = from x in Funs.DB.Weld_UsingMat where x.ProjectId == this.ProjectId && x.WeldId == WeldId.ToString() select x;
if (usingMat.Count()>0)
if (usingMat.Count() > 0)
{
sumUsingAmount = usingMat.Sum(e => e.Amount);
}
var recycleMat = from x in Funs.DB.Weld_RecycleMat where x.ProjectId == this.ProjectId && x.WeldId == WeldId.ToString() select x;
if (recycleMat.Count()>0)
if (recycleMat.Count() > 0)
{
sumRecycleAmount = recycleMat.Sum(e => e.RecycleAmount);
}

2
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
View File

@ -173,7 +173,7 @@
</f:Panel>
<f:Window ID="Window1" Title="编辑领料计划录入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="800px" Height="380px">
Width="800px" Height="420px">
</f:Window>
<f:Window ID="Window2" Title="导入领料计划" Hidden="true" EnableIFrame="true" EnableMaximize="false"
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"

5
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
View File

@ -65,8 +65,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
(CASE WHEN UsingPlan.InPutMan IS NOT NULL THEN (CASE WHEN userInput.UserName IS NOT NULL THEN userInput.UserName ELSE welderInput.WED_Name END)
ELSE '' END) AS InPutMan,
--man.UserName AS InPutMan,
((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)-
(SELECT ISNULL(SUM(ISNULL(re.RecycleAmount,0)),0) FROM dbo.Weld_RecycleMat re WHERE re.UsingPlanId=UsingPlan.UsingPlanId))
((SELECT ISNULL(SUM(ISNULL(us.Amount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId)+
(SELECT ISNULL(SUM(ISNULL(us.TwoAmount,0)),0) FROM dbo.Weld_UsingMat us WHERE us.UsingPlanId=UsingPlan.UsingPlanId))
AS UsedAmount,(CASE UsingPlan.IsFinish WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE NULL END) AS IsFinish
FROM dbo.Weld_UsingPlan AS UsingPlan
LEFT JOIN dbo.Weld_WeldInfo AS Weld ON Weld.WeldId=UsingPlan.WeldId
@ -403,6 +403,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
usingPlan.IsSubmit = oldUsedPlan.IsSubmit;
usingPlan.InPutMan = CurrUser.UserId;
usingPlan.IsSteelStru = oldUsedPlan.IsSteelStru;
usingPlan.UnitStoreId = oldUsedPlan.UnitStoreId;
usingPlan.Type = "1";
usingPlan.UsingPlanId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan));
BLL.UsingPlanService.AddUsingPlan(usingPlan);

9
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx
View File

@ -21,11 +21,18 @@
</f:HiddenField>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 45% 5%">
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Required="true" EnableEdit="true"
ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_OnSelectedIndexChanged">
</f:DropDownList>
<f:Label runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 45% 5%">
<Items>
<f:DropDownList ID="drpUnitStore" runat="server" Label="焊材库" LabelAlign="Right" EnableGroup="true" ShowRedStar="true">
</f:DropDownList>
<f:TextBox ID="txtWeldName" runat="server" Label="焊材牌号" LabelAlign="Right" Readonly="true"
Required="true" ShowRedStar="true">
</f:TextBox>

19
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
View File

@ -44,6 +44,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
BLL.UnitStoreService.InitUnitStoreDropDownList2(drpUnitStore, null, true);
this.drpOrderTime.DataTextField = "Text";
this.drpOrderTime.DataValueField = "Value";
this.drpOrderTime.DataSource = BLL.DropListService.OrderTimeList();
@ -84,6 +86,10 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (!string.IsNullOrEmpty(usingPlan.WeldId))
{
this.hdWeldId.Text = usingPlan.WeldId;
if (!string.IsNullOrEmpty(usingPlan.UnitStoreId))
{
this.drpUnitStore.SelectedValue = usingPlan.UnitStoreId;
}
var weld = BLL.WeldInfoService.GetWeldInfoById(usingPlan.WeldId);
if (weld != null)
{
@ -232,6 +238,11 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
Alert.ShowInTop("请选择施工号！", MessageBoxIcon.Warning);
return;
}
if (this.drpUnitStore.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
return;
}
if (this.drpUsePosition.SelectedValue == BLL.Const._Null && drpUsePosition.Text == "")
{
Alert.ShowInTop("请选择使用位置！", MessageBoxIcon.Warning);
@ -319,6 +330,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
}
Model.Weld_UsingPlan usingPlan = new Model.Weld_UsingPlan();
usingPlan.UnitStoreId = this.drpUnitStore.SelectedValue;
if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
{
usingPlan.WeldId = this.hdWeldId.Text.Trim();
@ -540,7 +552,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
/// <param name="e"></param>
protected void btnSelect_Click(object sender, EventArgs e)
{
string window = String.Format("ShowPlanWeld.aspx?projectId={0}", drpProjectId.SelectedValue, "编辑 - ");
if (this.drpUnitStore.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
return;
}
string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
}

9
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs generated
View File

@ -66,6 +66,15 @@ namespace FineUIPro.Web.WeldMat.UsingPlan {
/// </remarks>
protected global::FineUIPro.DropDownList drpProjectId;
/// <summary>
/// drpUnitStore 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitStore;
/// <summary>
/// txtWeldName 控件。
/// </summary>

40
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs
View File

@ -162,6 +162,26 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
errorInfos += (i + 2) + "行, [施工号] 不能为空</br>";
}
string unitStoreId = string.Empty;
if (ds.Tables[0].Rows[i]["焊材库"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊材库"].ToString()))
{
var unitStore = from x in Funs.DB.Weld_UnitStore where x.UnitStoreName == ds.Tables[0].Rows[i]["焊材库"].ToString() select x;
if (unitStore.Count() > 0)
{
usingPlan.UnitStoreId = unitStore.First().UnitStoreId;
unitStoreId = unitStore.First().UnitStoreId;
}
else
{
errorInfos += (i + 2) + "行, [焊材库] 不存在</br>";
}
}
else
{
errorInfos += (i + 2) + "行, [焊材库] 不能为空</br>";
}
string steelType = string.Empty;
string weldTypeId = string.Empty;
if (ds.Tables[0].Rows[i]["焊材牌号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊材牌号"].ToString())
@ -184,7 +204,20 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
}
else
{
errorInfos += (i + 2) + "Line, [焊材牌号和规格] 不能为空</br>";
errorInfos += (i + 2) + "行, [焊材牌号和规格] 不能为空</br>";
}
if (!string.IsNullOrEmpty(unitStoreId) && !string.IsNullOrEmpty(usingPlan.WeldId))
{
Model.SGGLDB db = Funs.DB;
var q = from x in db.Weld_WeldInfo
where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == usingPlan.WeldId select y.Amount ?? 0).Sum() - (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == usingPlan.WeldId select y.UsingAmount ?? 0).Sum() + (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == usingPlan.WeldId select y.RecycleAmount ?? 0).Sum() > 0 && (x.IsLock == null || x.IsLock == false)
orderby x.WeldCode
select x;
if (q.Count() == 0)
{
errorInfos += (i + 2) + "行, 焊材库对应焊材牌号和规格的焊材无库存 </br>";
}
}
string unitId = string.Empty;
@ -365,8 +398,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (ds.Tables[0].Rows[i]["时间段"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["时间段"].ToString()))
{
string strTime = ds.Tables[0].Rows[i]["时间段"].ToString();
if (BLL.DropListService.OrderTimeList().Any(x => x.Value == strTime))
var t = BLL.DropListService.OrderTimeList().FirstOrDefault(x => x.Value == strTime);
if (t != null)
{
usingPlan.OrderTime = strTime;
}
@ -374,7 +407,6 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
{
errorInfos += (i + 2) + "行, [时间段] 录入不正确</br>";
}
}
else
{

153
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx Normal file
View File

@ -0,0 +1,153 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FaceRecognition.aspx.cs" Inherits="FineUIPro.Web.WeldMat.UsingSentMat.FaceRecognition" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
<title>人脸识别</title>
<style id="Style1" runat="server" type="text/css">
.title
{
font-size:14pt;
font-weight:bold;
text-align:center;
}
video, canvas { border: 1px solid #ccc; margin: 10px; }
button { padding: 8px 16px; margin: 5px; }
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="true" BodyPadding="5px" IconFont="PlusCircle" Title="人脸识别"
TitleToolTip="人脸识别" AutoScroll="true">
<Items>
<f:ContentPanel ShowBorder="false" ShowHeader="false" ID="ContentPanel1" runat ="server" CssStyle="text-align:center" >
<video id="video" width="480" height="640" autoplay></video>
<canvas id="canvas" width="480" height="640" style="display:none" ></canvas>
<div>
<button id="captureBtn" type="button">识别</button>
</div>
</f:ContentPanel>
</Items>
</f:Panel>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单
const video = document.getElementById('video');
const canvas = document.getElementById('canvas');
const captureBtn = document.getElementById('captureBtn');
const ctx = canvas.getContext('2d');
let stream = null;
setTimeout(async () => {
try {
stream = await navigator.mediaDevices.getUserMedia({
video: {
width: { ideal:480 },
height: { ideal:640 },
facingMode: "environment" // 后置摄像头
},
audio: false
});
video.srcObject = stream;
} catch (err) {
console.log("摄像头访问错误:", err);
alert(`无法访问摄像头: ${err.message}`);
}
}, 1000)
// 截图功能
document.getElementById('captureBtn').addEventListener('click', () => {
if (!stream) return alert('请先开启摄像头');
if (captureBtn.innerHTML == '识别') {
captureBtn.innerHTML = '重新识别'
canvas.style = "";
video.style = "display:none";
// 适配高DPI屏幕
const scale = window.devicePixelRatio || 1;
canvas.width = video.videoWidth * scale;
canvas.height = video.videoHeight * scale;
ctx.scale(scale, scale);
ctx.drawImage(video, 0, 0, video.videoWidth, video.videoHeight);
// 生成图片下载链接
const imgUrl = canvas.toDataURL('image/jpeg');
upLoadFile(imgUrl)
//const link = document.createElement('a');
//link.download = 'capture-' + new Date().getTime() + '.jpg';
//link.href = imgUrl;
//link.click();
} else {
captureBtn.innerHTML = '识别'
video.style = "";
canvas.style = "display:none";
}
});
function upLoadFile(data) {
$.ajax({
url: "FaceRecognition.aspx/UploadData",
type: "POST",
contentType: "application/json; charset=utf-8",
dataType: "json",
data: JSON.stringify({
data: data
}),
success: function (data) {
/*window.parent.backData(data.d)*/
if (data.d.indexOf('识别失败') !== -1) {
alert('识别失败请重新识别')
}
else {
// window.location.href = 'UsingMat.aspx?welderQRCode=' + data.d ;
//window.open('UsingMat.aspx?welderCode=' + data.d , '_blank');
//var activeWindow = F.getActiveWindow();
//activeWindow.window.backData(data.d);
//activeWindow.hide();
var node = {
iframeUrl: './WeldMat/UsingSentMat/UsingMat.aspx?welderCode=' + data.d,
title: "焊材领用",
id: "UsingMat" + getFormattedDate()
};
window.parent.addExampleTab(node);
}
}
})
}
function getFormattedDate() {
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0');
const hours = String(now.getHours()).padStart(2, '0');
const minutes = String(now.getMinutes()).padStart(2, '0');
const seconds = String(now.getSeconds()).padStart(2, '0');
return year + month + day + hours + minutes + seconds;
}
</script>
</body>
</html>

83
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.cs Normal file
View File

@ -0,0 +1,83 @@
using BLL;
using SgManager.AI;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Web.Services;
using System.Web.UI;
namespace FineUIPro.Web.WeldMat.UsingSentMat
{
public partial class FaceRecognition : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
}
[WebMethod]
public static string UploadData(string data)
{
byte[] imageBytes = Convert.FromBase64String(data.Substring("data:image/jpeg;base64,".Length));
string filePath = "/FileUpLoad/FaceRecognition/" + DateTime.Now.ToString("yyyyMMddhhmmss") + ".jpeg";
if (!Directory.Exists(BLL.Funs.RootPath + "/FileUpLoad/FaceRecognition/"))
{
Directory.CreateDirectory(BLL.Funs.RootPath + "/FileUpLoad/FaceRecognition/");
}
// 使用MemoryStream将字节数组转换为图片
using (var ms = new MemoryStream(imageBytes, 0, imageBytes.Length))
{
System.Drawing.Image mImage = System.Drawing.Image.FromStream(ms);
// 使用Bitmap类从MemoryStream创建图片
using (Bitmap image = new Bitmap(mImage))
{
// 保存图片到文件
image.Save(BLL.Funs.RootPath + filePath, System.Drawing.Imaging.ImageFormat.Jpeg);
}
}
try
{
var kqFace = (List<SgManager.AI.faceResult>)SgManager.AI.FaceClass.SearchFileFace(BLL.Funs.RootPath + filePath);
if (kqFace == null || kqFace.Count == 0)
{
return "识别失败";
}
else if (kqFace[0].errMess != "SUCCESS")
{
return "识别失败;" + kqFace[0].errMess;
}
else
{
try
{
string idCard = kqFace[0].user_id;
var welder = Funs.DB.HJGL_BS_Welder.FirstOrDefault(x =>x.IdentityCard == idCard);
if (welder != null)
{
return welder.WED_Code;
}
else
{
return "识别失败;身份证号"+ idCard+"未找到焊工";
}
}
catch (Exception e)
{
}
}
}
catch (Exception e)
{
}
return "识别失败";
}
}
}

80
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/FaceRecognition.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,80 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.UsingSentMat
{
public partial class FaceRecognition
{
/// <summary>
/// Head1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// Style1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl Style1;
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
}
}

14
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderUsing.aspx
View File

@ -39,6 +39,17 @@
<tr >
<td height="15px"></td>
</tr>
<tr>
<td height="25" align="left" style="font-size:24px; font-weight:bold"> &nbsp;&nbsp;
ÈËÁ³Ê¶±ð£º
<input name="welderFaceLogin" type="button" onclick="welderFaceLogin();" id="welderFaceLogin" style="width: 120px;
height: 48px; font-size:20px; font-weight:bold" value="ÈËÁ³Ê¶±ð"/>
<asp:Button runat="server" ID="btnFace" OnClick="btnFace_Click" Visible="false"/>
</td>
</tr>
<tr >
<td height="15px"></td>
</tr>
<tr>
<td>
<h3>
@ -86,4 +97,7 @@
}
function welderFaceLogin() {
window.location.href = 'FaceRecognition.aspx';
}
</script>

5
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderUsing.aspx.cs
View File

@ -13,5 +13,10 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
{
}
protected void btnFace_Click(object sender, EventArgs e)
{
}
}
}

9
HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/WelderUsing.aspx.designer.cs generated
View File

@ -29,5 +29,14 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText welderQRCode;
/// <summary>
/// btnFace 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnFace;
}
}

28
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx
View File

@ -5,11 +5,17 @@
<head runat="server">
<title>人员管理</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style id="Style1" runat="server" type="text/css">
.headImage { width:100px !important; }
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
<f:Panel ID="Panel1" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px" Layout="HBox">
<Items>
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" BoxFlex="5"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
@ -85,6 +91,8 @@
</f:Image>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@ -104,6 +112,24 @@
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Panel ID="Panel5" Title="面板1" BoxFlex="1" runat="server" ShowBorder="false" ShowHeader="false"
Layout="VBox">
<Items>
<f:Image ID="imgPhoto1" CssClass="userphoto" ImageUrl="~/res/images/blank_150.png"
runat="server" BoxFlex="1">
</f:Image>
<f:FileUpload ID="filePhoto1" runat="server" ButtonText="上传头像到百度" ButtonOnly="true"
AutoPostBack="true" OnFileSelected="filePhoto1_FileSelected">
</f:FileUpload>
</Items>
</f:Panel>
</Items>
</f:Panel>
<f:Window ID="Window1" runat="server" Hidden="true" IsModal="false" Target="Top"
EnableMaximize="true" EnableResize="true" Title="弹出框" CloseAction="HidePostBack"
EnableIFrame="true">

165
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.cs
View File

@ -1,13 +1,19 @@
namespace FineUIPro.Web.common.WelderManage
{
using System;
using System.Drawing;
using BLL;
using Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SgManager.AI;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using ThoughtWorks.QRCode.Codec;
using ThoughtWorks.QRCode.Codec.Data;
using System.Text;
using System.IO;
public partial class WelderSave : PageBase
{
@ -151,6 +157,10 @@
{
imgPhoto.ImageUrl = person.SignatureUrl;
}
if (!string.IsNullOrEmpty(person.PhotoUrl))
{
imgPhoto1.ImageUrl = person.PhotoUrl;
}
}
else
{
@ -225,6 +235,8 @@
welder.ProjectId = this.CurrUser.LoginProjectId;
welder.AttachUrl = this.AttachUrl;
welder.SignatureUrl = imgPhoto.ImageUrl;
welder.PhotoUrl = imgPhoto1.ImageUrl;
welder.IsOAM = true;
if (string.IsNullOrEmpty(this.WED_ID))
{
@ -237,9 +249,126 @@
BLL.HJGL_PersonManageService.UpdateBSWelder(welder);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改人员信息！");
}
if (!string.IsNullOrEmpty(welder.PhotoUrl) )
{
Alert.ShowInParent(PersonFace(welder), MessageBoxIcon.Warning);
}
}
#endregion
public string PersonFace(Model.HJGL_BS_Welder person)
{
string message = string.Empty;
string filePath = Server.MapPath(person.PhotoUrl);
List<SgManager.AI.faceResult> kqFace = null;
try
{
ErrLogInfo.WriteLog("filePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePathfilePath:" + filePath);
kqFace = (List<SgManager.AI.faceResult>)SgManager.AI.FaceClass.SearchFileFace(filePath);
if (kqFace != null || kqFace.Count > 0 || kqFace[0].errMess == "SUCCESS")
{
string result = FaceClass.FaceVerify(filePath);
JObject jresult = JObject.Parse(result);
JObject lvresult = jresult.Value<JObject>("result");
bool isOK = false;
if (jresult.Value<int>("error_code") == 0)
{
if (lvresult.Value<double>("face_liveness") >= ConfigAppSetting.getConfigAppSetting("BD_face_liveness") ? true : false)//99.5%//活体度
{
if (Convert.ToDouble(lvresult["face_list"][0]["location"]["width"]) > ConfigAppSetting.getConfigAppSetting("BD_width") ? true : false)
{
if (Convert.ToDouble(lvresult["face_list"][0]["location"]["height"]) > ConfigAppSetting.getConfigAppSetting("BD_height") ? true : false)
{
if (System.Math.Abs(Convert.ToDouble(lvresult["face_list"][0]["angle"]["roll"])) <= ConfigAppSetting.getConfigAppSetting("BD_roll") ? true : false)//角度正负度数
{
if (System.Math.Abs(Convert.ToDouble(lvresult["face_list"][0]["angle"]["yaw"])) <= ConfigAppSetting.getConfigAppSetting("BD_roll") + 1 ? true : false)//角度正负度数
{
if (System.Math.Abs(Convert.ToDouble(lvresult["face_list"][0]["angle"]["pitch"])) <= ConfigAppSetting.getConfigAppSetting("BD_roll") + 1 ? true : false)//角度正负度数
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["left_eye"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["right_eye"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["nose"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["mouth"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["left_cheek"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["right_cheek"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["occlusion"]["chin_contour"]) <= ConfigAppSetting.getConfigAppSetting("BD_occlusion") ? true : false)// 0为无遮挡，1是完全遮挡
{
if (Convert.ToDouble(lvresult["face_list"][0]["quality"]["blur"]) <= ConfigAppSetting.getConfigAppSetting("BD_blur") ? true : false)//模糊度，0---1，小于0.7
{ isOK = true; }
else message = "清晰度检测失败"; ;
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "遮挡检测失败";
}
else message = "角度检测失败";
}
else message = "角度检测失败";
}
else message = "角度检测失败";
}
else message = "宽高检测失败";
}
else message = "宽高检测失败";
}
else message = "人脸动态检测失败";
}
else message = "识别不到人脸";
if (isOK)
{
var faceResult = FaceClass.add(person.WED_ID, person.IdentityCard, System.Configuration.ConfigurationManager.AppSettings["HJGLUrl"].ToString() + person.PhotoUrl.Replace("~\\", "").Replace("\\","/"), AccessToken.getAccessToken());
var face = JsonConvert.DeserializeObject<dynamic>(faceResult);
// JsonConvert.DeserializeObject<dynamic>(myPunishItem);
if (face.error_code == 0 || face.error_code == 223105)
{
message = "人脸库注册成功！";
// face_token = face.result.face_token;
//APIPersonService.SaveSitePerson(person);
}
else
{
message = "注册人脸库失败" + face.error_code + face.error_msg;
}
}
else
{
message += "注册人脸库失败";
}
}
}
catch (Exception ex)
{
message = "注册人脸库失败";
ErrLogInfo.WriteLog(ex, "PC-人员信息保存", "SitePerson.PersonListEdit");
}
return message;
}
#region 上传电子签名图片
/// <summary>
/// 上传照片
@ -264,6 +393,34 @@
filePhoto.Reset();
}
}
protected void filePhoto1_FileSelected(object sender, EventArgs e)
{
if (filePhoto1.HasFile)
{
string fileName = filePhoto1.ShortFileName;
if (!ValidateFileType(fileName))
{
ShowNotify("无效的文件类型！");
return;
}
fileName = fileName.Replace(":", "_").Replace(" ", "_").Replace("\\", "_").Replace("/", "_");
fileName = DateTime.Now.Ticks.ToString() + "_" + fileName;
filePhoto1.SaveAs(Server.MapPath("~/upload/" + fileName));
imgPhoto1.ImageUrl = "~/upload/" + fileName;
// 清空文件上传组件
filePhoto1.Reset();
var welder = Funs.DB.HJGL_BS_Welder.FirstOrDefault(x=>x.WED_ID== WED_ID);
welder.PhotoUrl = imgPhoto1.ImageUrl.Replace("/", "\\");
Funs.DB.SubmitChanges();
Alert.ShowInParent(PersonFace(welder), MessageBoxIcon.Warning);
}
}
#endregion
//protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
//{

51
HJGL_DS/FineUIPro.Web/common/WelderManage/WelderSave.aspx.designer.cs generated
View File

@ -7,10 +7,21 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common.WelderManage {
namespace FineUIPro.Web.common.WelderManage
{
public partial class WelderSave {
public partial class WelderSave
{
/// <summary>
/// Style1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl Style1;
/// <summary>
/// form1 控件。
@ -30,6 +41,15 @@ namespace FineUIPro.Web.common.WelderManage {
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -219,6 +239,33 @@ namespace FineUIPro.Web.common.WelderManage {
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Panel5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel5;
/// <summary>
/// imgPhoto1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Image imgPhoto1;
/// <summary>
/// filePhoto1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload filePhoto1;
/// <summary>
/// Window1 控件。
/// </summary>

2
HJGL_DS/FineUIPro.Web/packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
<package id="NPOI" version="2.5.5" targetFramework="net461" />
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
<package id="SharpZipLib" version="1.3.2" targetFramework="net461" />

1
HJGL_DS/Model/APIItem/UsingPlanItem.cs
View File

@ -145,5 +145,6 @@ namespace Model.APIItem
public string WeldName { get; set; }
public string WeldSpec { get; set; }
public string WeldCode { get; set; }
public string UnitStoreId { get; set; }
}
}

96
HJGL_DS/Model/Model.cs
View File

@ -24429,6 +24429,8 @@ namespace Model
private System.Nullable<decimal> _MaxHanTiao;
private string _PhotoUrl;
private EntitySet<HJGL_BO_Batch> _HJGL_BO_Batch;
private EntitySet<HJGL_BO_PreWeldReportMain> _HJGL_BO_PreWeldReportMain;
@ -24543,6 +24545,8 @@ namespace Model
partial void OnMaxWeldingWireChanged();
partial void OnMaxHanTiaoChanging(System.Nullable<decimal> value);
partial void OnMaxHanTiaoChanged();
partial void OnPhotoUrlChanging(string value);
partial void OnPhotoUrlChanged();
#endregion
public HJGL_BS_Welder()
@ -25369,6 +25373,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PhotoUrl", DbType="NVarChar(200)")]
public string PhotoUrl
{
get
{
return this._PhotoUrl;
}
set
{
if ((this._PhotoUrl != value))
{
this.OnPhotoUrlChanging(value);
this.SendPropertyChanging();
this._PhotoUrl = value;
this.SendPropertyChanged("PhotoUrl");
this.OnPhotoUrlChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BO_Batch_HJGL_BS_Welder", Storage="_HJGL_BO_Batch", ThisKey="WED_ID", OtherKey="WED_ID", DeleteRule="NO ACTION")]
public EntitySet<HJGL_BO_Batch> HJGL_BO_Batch
{
@ -100365,6 +100389,8 @@ namespace Model
private string _SignatureUrl;
private string _IdCard;
private EntitySet<Base_Project> _Base_Project;
private EntitySet<Common_NoticeSign> _Common_NoticeSign;
@ -100451,6 +100477,8 @@ namespace Model
partial void OnDeviceIdChanged();
partial void OnSignatureUrlChanging(string value);
partial void OnSignatureUrlChanged();
partial void OnIdCardChanging(string value);
partial void OnIdCardChanged();
#endregion
public Sys_User()
@ -100853,6 +100881,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IdCard", DbType="NVarChar(50)")]
public string IdCard
{
get
{
return this._IdCard;
}
set
{
if ((this._IdCard != value))
{
this.OnIdCardChanging(value);
this.SendPropertyChanging();
this._IdCard = value;
this.SendPropertyChanged("IdCard");
this.OnIdCardChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Project_Sys_User", Storage="_Base_Project", ThisKey="UserId", OtherKey="CreateManId", DeleteRule="NO ACTION")]
public EntitySet<Base_Project> Base_Project
{
@ -112632,6 +112680,8 @@ namespace Model
private string _Type;
private string _UnitStoreId;
private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
private EntitySet<Weld_RecycleMatTop> _Weld_RecycleMatTop;
@ -112694,6 +112744,8 @@ namespace Model
partial void OnIsSteelStruChanged();
partial void OnTypeChanging(string value);
partial void OnTypeChanged();
partial void OnUnitStoreIdChanging(string value);
partial void OnUnitStoreIdChanged();
#endregion
public Weld_UsingPlan()
@ -113209,6 +113261,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitStoreId", DbType="NVarChar(50)")]
public string UnitStoreId
{
get
{
return this._UnitStoreId;
}
set
{
if ((this._UnitStoreId != value))
{
this.OnUnitStoreIdChanging(value);
this.SendPropertyChanging();
this._UnitStoreId = value;
this.SendPropertyChanged("UnitStoreId");
this.OnUnitStoreIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_UsingPlan", Storage="_Weld_RecycleMat", ThisKey="UsingPlanId", OtherKey="UsingPlanId", DeleteRule="NO ACTION")]
public EntitySet<Weld_RecycleMat> Weld_RecycleMat
{
@ -113950,6 +114022,8 @@ namespace Model
private string _ModifyMan;
private System.Nullable<bool> _IsLock;
private EntitySet<Weld_ProjectPlan> _Weld_ProjectPlan;
private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
@ -113988,6 +114062,8 @@ namespace Model
partial void OnCreateManChanged();
partial void OnModifyManChanging(string value);
partial void OnModifyManChanged();
partial void OnIsLockChanging(System.Nullable<bool> value);
partial void OnIsLockChanged();
#endregion
public Weld_WeldInfo()
@ -114206,6 +114282,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsLock", DbType="Bit")]
public System.Nullable<bool> IsLock
{
get
{
return this._IsLock;
}
set
{
if ((this._IsLock != value))
{
this.OnIsLockChanging(value);
this.SendPropertyChanging();
this._IsLock = value;
this.SendPropertyChanged("IsLock");
this.OnIsLockChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_ProjectPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_ProjectPlan> Weld_ProjectPlan
{

3
HJGL_DS/Model/Model.csproj
View File

@ -39,6 +39,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data.Linq" />

2
HJGL_DS/Model/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" />
</packages>

18
HJGL_DS/SGGL.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.34601.136
# Visual Studio 15
VisualStudioVersion = 15.0.36001.139
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
EndProject
@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{58A1307F-9383-4C24-8FA7-6F19092BB11C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SgManager.AI", "SgManager.AI\SgManager.AI.csproj", "{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -63,6 +65,18 @@ Global
{58A1307F-9383-4C24-8FA7-6F19092BB11C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{58A1307F-9383-4C24-8FA7-6F19092BB11C}.Release|x86.ActiveCfg = Release|Any CPU
{58A1307F-9383-4C24-8FA7-6F19092BB11C}.Release|x86.Build.0 = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|x86.ActiveCfg = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Debug|x86.Build.0 = Debug|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|Any CPU.Build.0 = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|x86.ActiveCfg = Release|Any CPU
{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

23
HJGL_DS/SgManager.AI/APIBaseModel.cs Normal file
View File

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class APIBaseModel<T> where T : class, new()
{
public T contextModel//这里的context 调用要重新实例化一个
{
get; set;
}
public bool state { get; set; }
/// <summary>
/// 非接口信息错误
/// </summary>
public string errorMsg { get; set; }
}
}

39
HJGL_DS/SgManager.AI/AccessTokenModel.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class AccessTokenModel
{
public bool IsSuccess { get; set; }
public SuccessAccessTokenModel SuccessModel { get; set; }
public ErrorAccessTokenModel ErrorModel { get; set; }
}
/// <summary>
/// 获取accesstoken，正常 的 百度接口返回的json 实体模型
/// </summary>
public class SuccessAccessTokenModel
{
public string refresh_token { get; set; }
public int expires_in { get; set; }
public string scope { get; set; }
public string session_key { get; set; }
public string session_secret { get; set; }
public string access_token { get; set; }
}
/// <summary>
/// 获取accesstoken，失败的 百度接口返回的json 实体模型
/// </summary>
public class ErrorAccessTokenModel
{
public string error { get; set; }
public string error_description { get; set; }
}
}

98
HJGL_DS/SgManager.AI/BaiduError.cs Normal file
View File

@ -0,0 +1,98 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class BaiduError
{
public static string getBaiduError(String errCode)
{
string error = "未知错误";
switch (errCode)
{
case "222202":
error = "未识别到人脸";
break;
case "223106":
error = "该人脸不存在";
break;
case "223110":
error = "uid_list包含数量过多";
break;
case "223111":
error = "目标用户组不存在";
break;
case "223112":
error = "quality_conf格式不正确";
break;
case "223113":
error = "人脸有被遮挡,请重新操作";
break;
case "223114":
error = "人脸模糊,请重新操作";
break;
case "223115":
error = "人脸光照不好,请重新操作";
break;
case "223116":
error = "人脸不完整,请重新操作";
break;
case "223117":
error = "app_list包含app数量过多";
break;
case "223118":
error = "质量控制项错误";
break;
case "223119":
error = "活体控制项错误";
break;
case "223120":
error = "活体检测未通过,请重新操作";
break;
case "223121":
error = "左眼遮挡程度过高,请重新操作";
break;
case "223122":
error = "右眼遮挡程度过高,请重新操作";
break;
case "223123":
error = "左脸遮挡程度过高,请重新操作";
break;
case "223124":
error = "右脸遮挡程度过高,请重新操作";
break;
case "223125":
error = "下巴遮挡程度过高,请重新操作";
break;
case "223126":
error = "鼻子遮挡程度过高,请重新操作";
break;
case "223127":
error = "嘴巴遮挡程度过高,请重新操作";
break;
}
return error;
}
}
}

24
HJGL_DS/SgManager.AI/ConfigAppSetting.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class ConfigAppSetting
{
public static double getConfigAppSetting(String name)
{
try
{
return Convert.ToDouble(System.Configuration.ConfigurationManager.AppSettings[name]);
}
catch (Exception ex)
{
return 0;
}
}
}
}

33
HJGL_DS/SgManager.AI/ErrorTypeModel.cs Normal file
View File

@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
/// <summary>
/// 错误信息 实体
/// </summary>
public class ErrorTypeModel
{
/// <summary>
/// 日志Id
/// </summary>
public string log_id { get; set; }
/// <summary>
/// 错误码
/// </summary>
public string error_code { get; set; }
/// <summary>
/// 错误信息
/// </summary>
public string error_msg { get; set; }
/// <summary>
/// 错误信息中文描述
/// </summary>
public string error_discription { get; set; }
}
}

312
HJGL_DS/SgManager.AI/FaceClass.cs Normal file
View File

@ -0,0 +1,312 @@
using AOP.Common.DataConversion;
using Baidu.Aip.Face;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public static class FaceClass
{
public static Baidu.Aip.Face.Face getFaceClant()
{
// 设置APPID/AK/SK
var APP_ID = System.Configuration.ConfigurationManager.AppSettings["APP_ID"].ToString();
var API_KEY = System.Configuration.ConfigurationManager.AppSettings["API_KEY"].ToString();
var SECRET_KEY = System.Configuration.ConfigurationManager.AppSettings["SECRET_KEY"].ToString();
var client = new Baidu.Aip.Face.Face(API_KEY, SECRET_KEY);
client.Timeout = 60000; // 修改超时时间
return client;
}
public static object SearchFileFace(String imagePath)
{
String strbaser64 = ConvertDataFormatAndImage.ImageToByte64String(imagePath, System.Drawing.Imaging.ImageFormat.Jpeg); // 图片的base64编码
var imageType = "BASE64";
var groupIdList = "Face";
// 如果有可选参数
var options = new Dictionary<string, object>{
{"quality_control", "NORMAL"},
{"liveness_control", "NORMAL"},
{"max_user_num", 1}
};
// 带参数调用人脸搜索
object result = new object();
List<faceResult> frs = new List<faceResult>();
try
{
result = getFaceClant().Search(strbaser64, imageType, groupIdList, options);
if (result != null)
{
var data = JsonConvert.DeserializeObject<dynamic>(JsonConvert.SerializeObject(result));
String error_msg = data.error_msg;
String errorCode = data.error_code;
if (error_msg == "SUCCESS")
{
for (int i = 0; i < data.result.user_list.Count; i++)
{
faceResult fr = new faceResult();
fr.user_id = data.result.user_list[i].user_id;
fr.user_info = getUserName(fr.user_id);
fr.errMess = error_msg;
try
{
string score = data.result.user_list[i].score.ToString();
fr.score = double.Parse(score);
}
catch
{
fr.score = 0;
}
if (fr.score > 85)
frs.Add(fr);
}
}
else
{
faceResult fr = new faceResult();
fr.errMess = error_msg;
fr.errCode = errorCode;
frs.Add(fr);
}
}
}
catch (Exception ex)
{
faceResult fr = new faceResult();
fr.errMess = ex.ToString();
frs.Add(fr);
}
return frs;
}
public static object SearchFace(String url)
{
var image = url;
var imageType = "URL";
var groupIdList = "Face";
// 如果有可选参数
var options = new Dictionary<string, object>{
{"quality_control", "NORMAL"},
{"liveness_control", "LOW"},
{"max_user_num", 1}
};
// 带参数调用人脸搜索
object result = new object();
try
{
result = getFaceClant().Search(image, imageType, groupIdList, options);
}
catch (Exception ex)
{
return null;
}
List<faceResult> frs = new List<faceResult>();
if (result != null)
{
var data = JsonConvert.DeserializeObject<dynamic>(JsonConvert.SerializeObject(result));
String error_msg = data.error_msg;
if (error_msg == "SUCCESS")
{
for (int i = 0; i < data.result.user_list.Count; i++)
{
faceResult fr = new faceResult();
fr.user_id = data.result.user_list[i].user_id;
fr.user_info = getUserName(fr.user_id);
try
{
string score = data.result.user_list[i].score.ToString();
fr.score = double.Parse(score);
}
catch
{
fr.score = 0;
}
if (fr.score > 85)
{
frs.Add(fr);
break;
}
}
}
else return null;
}
return frs;
}
public static String getUserName(string id)
{
string userName = "未知用户";
switch (id)
{
case "A01844":
userName = "张腾云";
break;
case "A04979":
userName = "张延强";
break;
case "A05352":
userName = "王勇C";
break;
case "A06539":
userName = "崔璐峰";
break;
case "A04984":
userName = "杨新民";
break;
case "A05303":
userName = "李文娟";
break;
case "A04988":
userName = "马明";
break;
case "A06926":
userName = "王建峰";
break;
default:
userName = "未知用户";
break;
}
return userName;
}
// 在线活体检测
public static string FaceVerify(string imagePath)
{
string token = AccessToken.getAccessToken();
string host = "https://aip.baidubce.com/rest/2.0/face/v3/faceverify?access_token=" + token;
Encoding encoding = Encoding.Default;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "post";
request.KeepAlive = true;
String strbaser64 = ConvertDataFormatAndImage.ImageToByte64String(imagePath, System.Drawing.Imaging.ImageFormat.Jpeg); // 图片的base64编码
String str = "[{\"image\":\"" + strbaser64 + "\",\"image_type\":\"BASE64\",\"face_field\":\"quality,human\"}]";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.Default);
string result = reader.ReadToEnd();
//Console.WriteLine("在线活体检测:");
Console.WriteLine(result);
return result;
}
// 人脸注册
public static string add(string user_id, string user_card, string imgUrl, string token)
{
bool first = true;
if (string.IsNullOrEmpty(token))
{
token = AccessToken.getAccessToken();
first = false;
}
string host = "https://aip.baidubce.com/rest/2.0/face/v3/faceset/user/add?access_token=" + token;
Encoding encoding = Encoding.Default;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "post";
request.KeepAlive = true;
String str = "{\"image\":\"" + imgUrl + "\",\"image_type\":\"URL\",\"group_id\":\"Face\",\"user_id\":\"" + user_card + "\",\"user_info\":\"" + user_id + "\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.Default);
string result = reader.ReadToEnd();
//Console.WriteLine("人脸注册:");
//Console.WriteLine(result);
var res = JsonConvert.DeserializeObject<dynamic>(result);
if (result.Contains("Access token invalid or no longer valid") && first)
{
token = null;
add(user_id, user_card, imgUrl, token);
}
if (result.Contains("face is already exist"))
result = update(user_id, user_card, imgUrl, token);
if (res.error_code == "0")
{
}
return result;
}
// 人脸更新
public static string update(string user_id, string user_card, string imgUrl, string token)
{
if (string.IsNullOrEmpty(token))
token = AccessToken.getAccessToken();
string host = "https://aip.baidubce.com/rest/2.0/face/v3/faceset/user/update?access_token=" + token;
Encoding encoding = Encoding.Default;
HttpWebRequest request = (HttpWebRequest)WebRequest.Create(host);
request.Method = "post";
request.KeepAlive = true;
String str = "{\"image\":\"" + imgUrl + "\",\"image_type\":\"URL\",\"group_id\":\"Face\",\"user_id\":\"" + user_card + "\",\"user_info\":\"" + user_id + "\",\"quality_control\":\"LOW\",\"liveness_control\":\"NORMAL\"}";
byte[] buffer = encoding.GetBytes(str);
request.ContentLength = buffer.Length;
request.GetRequestStream().Write(buffer, 0, buffer.Length);
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.Default);
string result = reader.ReadToEnd();
if (result.Contains("user is not exist"))
result = add(user_id, user_card, imgUrl, token);
return result;
}
}
public static class AccessToken
{
// 调用getAccessToken()获取的 access_token建议根据expires_in 时间 设置缓存
// 返回token示例
public static String TOKEN = "24.adda70c11b9786206253ddb70affdc46.2592000.1493524354.282335-1234567";
// 百度云中开通对应服务应用的 API Key 建议开通应用的时候多选服务
private static String clientId = "百度云应用的AK";
// 百度云中开通对应服务应用的 Secret Key
private static String clientSecret = "百度云应用的SK";
public static String getAccessToken()
{
String authHost = "https://aip.baidubce.com/oauth/2.0/token";
HttpClient client = new HttpClient();
List<KeyValuePair<String, String>> paraList = new List<KeyValuePair<string, string>>();
paraList.Add(new KeyValuePair<string, string>("grant_type", "client_credentials"));
paraList.Add(new KeyValuePair<string, string>("client_id", System.Configuration.ConfigurationManager.AppSettings["API_KEY"].ToString()));
paraList.Add(new KeyValuePair<string, string>("client_secret", System.Configuration.ConfigurationManager.AppSettings["SECRET_KEY"].ToString()));
HttpResponseMessage response = client.PostAsync(authHost, new FormUrlEncodedContent(paraList)).Result;
String result = response.Content.ReadAsStringAsync().Result;
var to = JsonConvert.DeserializeObject<dynamic>(result);
Console.WriteLine(result);
return to.access_token;
}
}
}

162
HJGL_DS/SgManager.AI/GpsPolygonHelper.cs Normal file
View File

@ -0,0 +1,162 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class Gpslocation
{
public double lat;
public double lng;
}
public class GpsPolygonHelper
{/// <summary>
/// 判断当前位置是否在不规则形状里面
/// </summary>
/// <param name="nvert">不规则形状的定点数</param>
/// <param name="vertx">当前x坐标</param>
/// <param name="verty">当前y坐标</param>
/// <param name="testx">不规则形状x坐标集合</param>
/// <param name="testy">不规则形状y坐标集合</param>
/// <returns></returns>
public static bool PositionPnpoly(int nvert, List<double> vertx, List<double> verty, double testx, double testy)
{
int i, j, c = 0;
for (i = 0, j = nvert - 1; i < nvert; j = i++)
{
if (((verty[i] > testy) != (verty[j] > testy)) && (testx < (vertx[j] - vertx[i]) * (testy - verty[i]) / (verty[j] - verty[i]) + vertx[i]))
{
c = 1 + c; ;
}
}
if (c % 2 == 0)
{
return false;
}
else
{
return true;
}
}
/// <summary>
/// 坐标点是否在多边形内判断
/// </summary>
/// <param name="point"></param>
/// <param name="pts"></param>
/// <returns></returns>
public static bool isPointInPolygon(Gpslocation point, List<Gpslocation> pts)
{
//检查类型
if (point == null || pts == null)
return false;
var N = pts.Count;
var boundOrVertex = true; //如果点位于多边形的顶点或边上，也算做点在多边形内，直接返回true
var intersectCount = 0; //cross points count of x
var precision = 2e-10; //浮点类型计算时候与0比较时候的容差
Gpslocation p1, p2; //neighbour bound vertices
var p = point; //测试点
p1 = pts[0]; //left vertex
for (var i = 1; i <= N; ++i)
{
//check all rays
if (p.lat.Equals(p1.lat) && p.lng.Equals(p1.lng))
{
return boundOrVertex; //p is an vertex
}
p2 = pts[i % N]; //right vertex
if (p.lat < Math.Min(p1.lat, p2.lat) || p.lat > Math.Max(p1.lat, p2.lat))
{
//ray is outside of our interests
p1 = p2;
continue; //next ray left point
}
if (p.lat > Math.Min(p1.lat, p2.lat) && p.lat < Math.Max(p1.lat, p2.lat))
{
//ray is crossing over by the algorithm (common part of)
if (p.lng <= Math.Max(p1.lng, p2.lng))
{
//x is before of ray
if (p1.lat == p2.lat && p.lng >= Math.Min(p1.lng, p2.lng))
{
//overlies on a horizontal ray
return boundOrVertex;
}
if (p1.lng == p2.lng)
{
//ray is vertical
if (p1.lng == p.lng)
{
//overlies on a vertical ray
return boundOrVertex;
}
else
{
//before ray
++intersectCount;
}
}
else
{
//cross point on the left side
var xinters =
(p.lat - p1.lat) * (p2.lng - p1.lng) / (p2.lat - p1.lat) +
p1.lng; //cross point of lng
if (Math.Abs(p.lng - xinters) < precision)
{
//overlies on a ray
return boundOrVertex;
}
if (p.lng < xinters)
{
//before ray
++intersectCount;
}
}
}
}
else
{
//special case when ray is crossing through the vertex
if (p.lat == p2.lat && p.lng <= p2.lng)
{
//p crossing over p2
var p3 = pts[(i + 1) % N]; //next vertex
if (p.lat >= Math.Min(p1.lat, p3.lat) && p.lat <= Math.Max(p1.lat, p3.lat))
{
//p.lat lies between p1.lat & p3.lat
++intersectCount;
}
else
{
intersectCount += 2;
}
}
}
p1 = p2; //next ray left point
}
if (intersectCount % 2 == 0)
{
//偶数在多边形外
return false;
}
else
{
//奇数在多边形内
return true;
}
}
}
}

40
HJGL_DS/SgManager.AI/IDCardClass.cs Normal file
View File

@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class IDCardClass
{
// Distinguish(pb_SidePic.ImageLocation, "back", false, "true");
// Distinguish(pb_PositivePic.ImageLocation, "front", false, "true");
/// <summary>
/// 识别操作
/// </summary>
/// <param name="filePath"></param>
/// <param name="id_card_side">身份证 正面还是背面</param>
/// <param name="detect_direction"></param>
/// <param name="detect_risk"></param>
public static APIBaseModel<IDCardRecognitionModel> idcard(string filePath, string id_card_side = "front", bool detect_direction = false, string detect_risk = "false")
{
var temp = IDCardToken.GetAccessToken();
if (temp.IsSuccess)
{
string data = "";
string error = "";
string token = temp.SuccessModel.access_token;
var result = IDCardRecognition.GetIdcardRecognitionString(temp.SuccessModel.access_token, filePath, ref data, out error, id_card_side, detect_direction, detect_risk);
return result;
}
return null;
}
}
}

84
HJGL_DS/SgManager.AI/IDCardRecognition.cs Normal file
View File

@ -0,0 +1,84 @@
using AOP.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web;
namespace SgManager.AI
{
/// <summary>
/// 文字识别--身份证识别 应用（只是获取身份证图片 信息，没有和公安部联网，无法确认真假，只是单纯从图片上识别文字）
/// </summary>
public class IDCardRecognition
{
// 身份证识别
/// <summary>
/// 身份证识别
/// </summary>
/// <param name="token">Accesstoken</param>
/// <param name="imagePath">图片路径</param>
/// <param name="recognitionString">识别结果</param>
/// <param name="errorMsg">错误信息</param>
/// <param name="id_card_side"> front：身份证正面；back：身份证背面</param>
/// <param name="detect_direction">是否检测图像朝向，默认不检测，即：false。朝向是指输入图像是正常方向、逆时针旋转90/180/270度。可选值包括:- true：检测朝向；- false：不检测朝向。</param>
/// <param name="detect_risk"> string 类型 是否开启身份证风险类型(身份证复印件、临时身份证、身份证翻拍、修改过的身份证)功能，默认不开启，即：false。可选值:true-开启；false-不开启</param>
/// <returns>结果状态</returns>
public static APIBaseModel<IDCardRecognitionModel> GetIdcardRecognitionString(string token, string imagePath, ref string recognitionString, out string errorMsg, string id_card_side = "front", bool detect_direction = false, string detect_risk = "false")
{
bool resultState = true;
APIBaseModel<IDCardRecognitionModel> tempModel = new APIBaseModel<IDCardRecognitionModel>();
tempModel.contextModel = new IDCardRecognitionModel();
string strbaser64 = "";
try
{
#region 基础校验
string verificationMsg = "";
errorMsg = "";
var verifyResult = ImageVerification.VerificationImage<IDCardRecognitionModel>(imagePath, System.Drawing.Imaging.ImageFormat.Jpeg, tempModel, out verificationMsg, out strbaser64);
if (!verifyResult.state)
{
return verifyResult;
}
recognitionString = "";
string host = "https://aip.baidubce.com/rest/2.0/ocr/v1/idcard?access_token=" + token;
String str = "id_card_side=" + id_card_side + "&detect_direction=" + detect_direction + "&detect_risk=" + detect_risk + "&image=" + HttpUtility.UrlEncode(strbaser64);
var tempResult = HttpRequestHelper.Post(host, str);
recognitionString = tempResult;
if (recognitionString.Contains("\"error_code\""))//说明异常
{
resultState = false;
tempModel.state = false;
tempModel.contextModel.errorTypeModel = Json.ToObject<ErrorTypeModel>(tempResult);
tempModel.contextModel.errorTypeModel.error_discription = OCR_CharacterRecognitionErrorType.GetErrorCodeToDescription(tempModel.contextModel.errorTypeModel.error_code);
}
else
{
tempModel.state = true;
var temp = Json.ToObject<IDCardRecognitionSuccessResultModel>(tempResult);
tempModel.contextModel.successModel = temp;
}
#endregion
return tempModel;
}
catch (Exception ex)//接口外部异常，如网络异常
{
resultState = false;
errorMsg = ex.ToString();
tempModel.state = false;
tempModel.errorMsg = ex.ToString();
return tempModel;
}
}
}
}

138
HJGL_DS/SgManager.AI/IDCardRecognitionModel.cs Normal file
View File

@ -0,0 +1,138 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{ /// <summary>
/// 身份证识别 实体
/// </summary>
public class IDCardRecognitionModel
{
public IDCardRecognitionSuccessResultModel successModel { get; set; }
public ErrorTypeModel errorTypeModel { get; set; }
}
public class IDCardRecognitionSuccessResultModel
{
public long log_id { get; set; }
public int direction { get; set; }
public int words_result_num { get; set; }
public string image_status { get; set; }
public string idcard_type { get; set; }
public string edit_tool { get; set; }
public string risk_type { get; set; }
public Words_result words_result { get; set; }
}
public class Words_result
{
public 住址 住址 { get; set; }
public 公民身份号码 公民身份号码 { get; set; }
public 出生 出生 { get; set; }
public 姓名 姓名 { get; set; }
public 性别 性别 { get; set; }
public 民族 民族 { get; set; }
public 签发日期 签发日期 { get; set; }
public 失效日期 失效日期 { get; set; }
public 签发机关 签发机关 { get; set; }
}
public class 住址
{
public Location location { get; set; }
public string words { get; set; }
}
public class 公民身份号码
{
public Location location { get; set; }
public string words { get; set; }
}
public class 出生
{
public Location location { get; set; }
public string words { get; set; }
}
public class 姓名
{
public Location location { get; set; }
public string words { get; set; }
}
public class 性别
{
public Location location { get; set; }
public string words { get; set; }
}
public class 民族
{
public Location location { get; set; }
public string words { get; set; }
}
public class 签发日期
{
public Location location { get; set; }
public string words { get; set; }
}
public class 失效日期
{
public Location location { get; set; }
public string words { get; set; }
}
public class 签发机关
{
public Location location { get; set; }
public string words { get; set; }
}
public class Location
{
public int left { get; set; }
public int top { get; set; }
public int width { get; set; }
public int height { get; set; }
}
public class DicModel
{
public string words { get; set; }
public Location location { get; set; }
}
}

60
HJGL_DS/SgManager.AI/IDCardToken.cs Normal file
View File

@ -0,0 +1,60 @@
using AOP.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public static class IDCardToken
{
// 调用getAccessToken()获取的 access_token建议根据expires_in 时间 设置缓存
// 返回token示例
public static String TOKEN = "24.adda70c11b9786206253ddb70affdc46.2592000.1493524354.282335-1234567";
// 百度云中开通对应服务应用的 API Key 建议开通应用的时候多选服务
private static String clientId = System.Configuration.ConfigurationManager.AppSettings["ID_API_KEY"].ToString();// "onreA4ms0OUi2eclj8CnMoaV";
// 百度云中开通对应服务应用的 Secret Key
private static String clientSecret = System.Configuration.ConfigurationManager.AppSettings["ID_SECRET_KEY"].ToString();// "ge8kERfb5uxqUKyOhdLMD2ozumNUigjY";
private static String getBaiduAccessToken()
{
String authHost = "https://aip.baidubce.com/oauth/2.0/token";
HttpClient client = new HttpClient();
List<KeyValuePair<String, String>> paraList = new List<KeyValuePair<string, string>>();
paraList.Add(new KeyValuePair<string, string>("grant_type", "client_credentials"));
paraList.Add(new KeyValuePair<string, string>("client_id", clientId));
paraList.Add(new KeyValuePair<string, string>("client_secret", clientSecret));
HttpResponseMessage response = client.PostAsync(authHost, new FormUrlEncodedContent(paraList)).Result;
String result = response.Content.ReadAsStringAsync().Result;
Console.WriteLine(result);
return result;
}
public static AccessTokenModel GetAccessToken()
{
AccessTokenModel tempAccessTokenModel = new AccessTokenModel();
string tempData = getBaiduAccessToken();
if (tempData.Contains("\"error\""))
{//标识异常
tempAccessTokenModel.IsSuccess = false;
tempAccessTokenModel.ErrorModel = Json.ToObject<ErrorAccessTokenModel>(tempData);
}
else
{//标识正常
tempAccessTokenModel.IsSuccess = true;
tempAccessTokenModel.SuccessModel = Json.ToObject<SuccessAccessTokenModel>(tempData);
}
return tempAccessTokenModel;
}
}
}

142
HJGL_DS/SgManager.AI/ImageVerification.cs Normal file
View File

@ -0,0 +1,142 @@
using AOP.Common.DataConversion;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Web;
namespace SgManager.AI
{
public class ImageVerification
{
/// <summary>
/// 验证图片规格
/// </summary>
/// <param name="filePath">图片路径</param>
/// <param name="Msg"></param>
/// <param name="defaultImageSize">默认图片最大是4MB</param>
/// <param name="defaultShortLength">默认最短15px</param>
/// <param name="defaultLongLength">默认最长4096px</param>
/// <returns>是否验证通过</returns>
public static bool VerificationImage(string filePath, out string Msg, int defaultImageSize = 1024 * 1024 * 4, int defaultShortLength = 15, int defaultLongLength = 4096)
{
bool isPass = true;
Msg = "";//提示信息
string filename = System.IO.Path.GetFileName(filePath);
#region 初始化验证参数
if (!File.Exists(filePath))
{
return false;
}
if (string.IsNullOrEmpty(filename))
{
Msg = "文件不能为空！";
return false;
}
#endregion
#region 验证是否是图片
bool isImg = false;//是否是图片标识
string[] imgTypeList = new string[] { ".jpg", ".png", "bmp" };
//得到文件后缀
string fileType = System.IO.Path.GetExtension(filePath);
for (int i = 0; i < imgTypeList.Count(); i++)
{
if (fileType.ToLower() == imgTypeList[i])
{
isImg = true;
}
}
if (!isImg)
{
Msg = "上传文件不是图片格式！请重新上传！";
return false;
}
#endregion
#region 验证图片大小
int imgSize = defaultImageSize;
byte[] bs = File.ReadAllBytes(filePath);
if (bs.Length > imgSize)
{
Msg = "图片大小不能" + imgSize / 1024 / 1024 + "MB";
return false;
}
#endregion
#region 验证图片尺寸大小
System.Drawing.Image tempImage = System.Drawing.Image.FromFile(filePath);
int picWidth = tempImage.Width;
int picHeigth = tempImage.Height;
if (!(defaultShortLength <= picWidth && picWidth <= defaultLongLength) && (defaultShortLength <= picHeigth && picHeigth <= defaultLongLength))
{
Msg = "图片尺寸规格最短边至少" + defaultShortLength + "px，最长边最大" + defaultLongLength + "px,";
return false;
}
#endregion
return isPass;
}
public static APIBaseModel<T> VerificationImage<T>(string imagePath, System.Drawing.Imaging.ImageFormat imageFormat, APIBaseModel<T> tempModel, out string errorMsg, out string strbaser64) where T : class, new()
{
#region 基础校验
string verificationMsg = "";
strbaser64 = "";
errorMsg = "";
bool isVerification = ImageVerification.VerificationImage(imagePath, out verificationMsg);
if (!isVerification)
{
errorMsg += verificationMsg;
tempModel.state = false;
tempModel.errorMsg = errorMsg;
return tempModel;
}
strbaser64 = ConvertDataFormatAndImage.ImageToByte64String(imagePath, imageFormat); // 图片的base64编码
Encoding encoding = Encoding.Default;
string urlEncodeImage = HttpUtility.UrlEncode(strbaser64);
byte[] tempBuffer = encoding.GetBytes(urlEncodeImage);
if (tempBuffer.Length > 1024 * 1024 * 4)
{
errorMsg += "图片加密 后的大小超过4MB！";
tempModel.state = false;
tempModel.errorMsg = errorMsg;
return tempModel;
}
tempModel.state = true;
return tempModel;
#endregion
}
}
}

12
HJGL_DS/SgManager.AI/MapClass.cs Normal file
View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
class MapClass
{
}
}

64
HJGL_DS/SgManager.AI/OCR_CharacterRecognitionErrorType.cs Normal file
View File

@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class OCR_CharacterRecognitionErrorType
{
public static string GetErrorCodeToDescription(string errorCode)
{
string errorDecrition = "";
switch (errorCode)
{
case "1": errorDecrition = "服务器内部错误，请再次请求， 如果持续出现此类错误，请通过QQ群（224994340）或工单联系技术支持团队。"; break;
case "2": errorDecrition = "服务暂不可用，请再次请求， 如果持续出现此类错误，请通过QQ群（224994340）或工单联系技术支持团队。"; break;
case "3": errorDecrition = "调用的API不存在，请检查后重新尝试。"; break;
case "4": errorDecrition = "集群超限额。"; break;
case "6": errorDecrition = "无权限访问该用户数据。"; break;
case "14": errorDecrition = "IAM鉴权失败，建议用户参照文档自查生成sign的方式是否正确，或换用控制台中ak sk的方式调用。"; break;
case "17": errorDecrition = "每天请求量超限额。"; break;
case "18": errorDecrition = "QPS超限额。"; break;
case "19": errorDecrition = "请求总量超限额。"; break;
case "100": errorDecrition = "无效的access_token参数，请检查后重新尝试。"; break;
case "110": errorDecrition = "access token过期。"; break;
case "282000": errorDecrition = "服务器内部错误，如果您使用的是高精度接口，报这个错误码的原因可能是您上传的图片中文字过多，识别超时导致的，建议您对图片进行切割后再识别，其他情况请再次请求， 如果持续出现此类错误，请通过QQ群（631977213）或工单联系技术支持团队。"; break;
case "216100": errorDecrition = "请求中包含非法参数，请检查后重新尝试。"; break;
case "216101": errorDecrition = "缺少必须的参数，请检查参数是否有遗漏。"; break;
case "216102": errorDecrition = "请求了不支持的服务，请检查调用的url。"; break;
case "216103": errorDecrition = "请求中某些参数过长，请检查后重新尝试。"; break;
case "216110": errorDecrition = "appid不存在，请重新核对信息是否为后台应用列表中的appid。"; break;
case "216200": errorDecrition = "图片为空，请检查后重新尝试。"; break;
case "216201": errorDecrition = "上传的图片格式错误，现阶段我们支持的图片格式为：PNG、JPG、JPEG、BMP，请进行转码或更换图片。"; break;
case "216202": errorDecrition = "上传的图片大小错误，现阶段我们支持的图片大小为：base64编码后小于4M，分辨率不高于4096*4096，请重新上传图片。"; break;
case "216630": errorDecrition = "识别错误，请再次请求，如果持续出现此类错误，请通过QQ群（631977213）或工单联系技术支持团队。"; break;
case "216631": errorDecrition = "识别银行卡错误，出现此问题的原因一般为：您上传的图片非银行卡正面，上传了异形卡的图片或上传的银行卡正品图片不完整。"; break;
case "216633": errorDecrition = "识别身份证错误，出现此问题的原因一般为：您上传了非身份证图片或您上传的身份证图片不完整。"; break;
case "216634": errorDecrition = "检测错误，请再次请求，如果持续出现此类错误，请通过QQ群（631977213）或工单联系技术支持团队。"; break;
case "282003": errorDecrition = "请求参数缺失。"; break;
case "282005": errorDecrition = "处理批量任务时发生部分或全部错误，请根据具体错误码排查。"; break;
case "282006": errorDecrition = "批量任务处理数量超出限制，请将任务数量减少到10或10以下。"; break;
case "282110": errorDecrition = "URL参数不存在，请核对URL后再次提交。"; break;
case "282111": errorDecrition = "URL格式非法，请检查url格式是否符合相应接口的入参要求。"; break;
case "282112": errorDecrition = "url下载超时，请检查url对应的图床/图片无法下载或链路状况不好，您可以重新尝试一下，如果多次尝试后仍不行，建议更换图片地址。"; break;
case "282113": errorDecrition = "URL返回无效参数。"; break;
case "282114": errorDecrition = "URL长度超过1024字节或为0。"; break;
case "282808": errorDecrition = "request id xxxxx 不存在。"; break;
case "282809": errorDecrition = "返回结果请求错误（不属于excel或json）。"; break;
case "282810": errorDecrition = "图像识别错误。"; break;
default: errorDecrition = "未知的错误！"; break;
}
return errorDecrition;
}
}
}

94
HJGL_DS/SgManager.AI/PostMail.cs Normal file
View File

@ -0,0 +1,94 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class PostMail
{
public class EmailParameterSet
{
/// <summary>
/// 收件人的邮件地址
/// </summary>
public string ConsigneeAddress { get; set; }
/// <summary>
/// 收件人的名称
/// </summary>
public string ConsigneeName { get; set; }
/// <summary>
/// 收件人标题
/// </summary>
public string ConsigneeHand { get; set; }
/// <summary>
/// 收件人的主题
/// </summary>
public string ConsigneeTheme { get; set; }
/// <summary>
/// 发件邮件服务器的Smtp设置
/// </summary>
public string SendSetSmtp { get; set; }
/// <summary>
/// 发件人的邮件
/// </summary>
public string SendEmail { get; set; }
/// <summary>
/// 发件人的邮件密码
/// </summary>
public string SendPwd { get; set; }
/// <summary>
/// 发件内容
/// </summary>
public string SendContent { get; set; }
}
public bool MailSend(EmailParameterSet EPSModel)
{
try
{
//确定smtp服务器端的地址，实列化一个客户端smtp
System.Net.Mail.SmtpClient sendSmtpClient = new System.Net.Mail.SmtpClient(EPSModel.SendSetSmtp);//发件人的邮件服务器地址
//构造一个发件的人的地址
System.Net.Mail.MailAddress sendMailAddress = new MailAddress(EPSModel.SendEmail, EPSModel.ConsigneeHand, Encoding.UTF8);//发件人的邮件地址和收件人的标题、编码
//构造一个收件的人的地址
System.Net.Mail.MailAddress consigneeMailAddress = new MailAddress(EPSModel.ConsigneeAddress, EPSModel.ConsigneeName, Encoding.UTF8);//收件人的邮件地址和收件人的名称 和编码
//构造一个Email对象
System.Net.Mail.MailMessage mailMessage = new MailMessage(sendMailAddress, consigneeMailAddress);//发件地址和收件地址
mailMessage.Subject = EPSModel.ConsigneeTheme;//邮件的主题
mailMessage.BodyEncoding = Encoding.UTF8;//编码
mailMessage.SubjectEncoding = Encoding.UTF8;//编码
mailMessage.Body = EPSModel.SendContent;//发件内容
mailMessage.IsBodyHtml = false;//获取或者设置指定邮件正文是否为html
//设置邮件信息 (指定如何处理待发的电子邮件)
sendSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;//指定如何发邮件 是以网络来发
sendSmtpClient.EnableSsl = false;//服务器支持安全接连，安全则为true
sendSmtpClient.UseDefaultCredentials = false;//是否随着请求一起发
//用户登录信息
NetworkCredential myCredential = new NetworkCredential(EPSModel.SendEmail, EPSModel.SendPwd);
sendSmtpClient.Credentials = myCredential;//登录
sendSmtpClient.Send(mailMessage);//发邮件
return true;//发送成功
}
catch (Exception)
{
return false;//发送失败
}
}
}
}

36
HJGL_DS/SgManager.AI/Properties/AssemblyInfo.cs Normal file
View File

@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("SgManager.AI")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SgManager.AI")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
//将 ComVisible 设置为 false 将使此程序集中的类型
//对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型，
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("55f4e1e2-5fb3-4ab4-b692-432ce41b3e61")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

87
HJGL_DS/SgManager.AI/SgManager.AI.csproj Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{55F4E1E2-5FB3-4AB4-B692-432CE41B3E61}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SgManager.AI</RootNamespace>
<AssemblyName>SgManager.AI</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AipSdk, Version=3.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\FineUIPro\Reference BLL\AipSdk.dll</HintPath>
</Reference>
<Reference Include="AOP.Common">
<HintPath>..\FineUIPro\Reference BLL\AOP.Common.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AccessTokenModel.cs" />
<Compile Include="APIBaseModel.cs" />
<Compile Include="BaiduError.cs" />
<Compile Include="ConfigAppSetting.cs" />
<Compile Include="ErrorTypeModel.cs" />
<Compile Include="FaceClass.cs" />
<Compile Include="faceResult.cs" />
<Compile Include="GpsPolygonHelper.cs" />
<Compile Include="IDCardRecognition.cs" />
<Compile Include="IDCardRecognitionModel.cs" />
<Compile Include="IDCardClass.cs" />
<Compile Include="IDCardToken.cs" />
<Compile Include="ImageVerification.cs" />
<Compile Include="MapClass.cs" />
<Compile Include="OCR_CharacterRecognitionErrorType.cs" />
<Compile Include="PostMail.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

11
HJGL_DS/SgManager.AI/app.config Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>

18
HJGL_DS/SgManager.AI/faceResult.cs Normal file
View File

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SgManager.AI
{
public class faceResult
{
public String errMess { get; set; }
public String user_id { get; set; }
public String user_info { get; set; }
public String errCode { get; set; }
public double score { get; set;}
}
}

4
HJGL_DS/SgManager.AI/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
</packages>

26
HJGL_DS/WebAPI/Controllers/BaseController.cs
View File

@ -46,13 +46,13 @@ namespace WebAPI.Controllers
return respone;
}
[HttpGet]
public Model.ResponeData weldInfoList(string weldName, int page, int pageSize)
public Model.ResponeData weldInfoList(string weldName, string unitStoreId, int page, int pageSize)
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.weldInfoList(weldName, page, pageSize);
return APIBaseServices.weldInfoList(weldName, unitStoreId, page, pageSize);
}
catch (Exception e)
{
@ -149,6 +149,24 @@ namespace WebAPI.Controllers
}
[HttpGet]
public Model.ResponeData unitStoreList()
{
Model.ResponeData respone = new ResponeData();
try
{
return APIBaseServices.unitStoreList();
}
catch (Exception e)
{
respone.code = 0;
respone.message = e.Message;
}
return respone;
}
[HttpGet]
public Model.ResponeData bsSteelList(string ste_Code, int page, int pageSize)
{
@ -191,10 +209,10 @@ namespace WebAPI.Controllers
{
using (Model.SGGLDB db = new Model.SGGLDB(BLL.Funs.ConnString))
{
Model.Sys_Const c = db.Sys_Const.FirstOrDefault(x=>x.ConstText== "Version");
Model.Sys_Const c = db.Sys_Const.FirstOrDefault(x => x.ConstText == "Version");
if (c != null)
{
respone.data= c.ConstValue;
respone.data = c.ConstValue;
return respone;
}
}

31
HJGL_DS/WebAPI/Controllers/WeldController.cs
View File

@ -84,6 +84,37 @@ namespace WebAPI.Controllers
return respone;
}
[HttpGet]
public Model.ResponeData isHaveWeld(string welderId, string unitStoreId)
{
Model.ResponeData respone = new ResponeData();
try
{
Model.SGGLDB db = BLL.Funs.DB;
var q = from x in db.Weld_WeldInfo
where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == welderId select y.Amount ?? 0).Sum() - (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == welderId select y.UsingAmount ?? 0).Sum() + (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == welderId select y.RecycleAmount ?? 0).Sum() > 0 && (x.IsLock == null || x.IsLock == false)
orderby x.WeldCode
select x;
if (q.Count() == 0)
{
respone.code = 0;
respone.message = "所选焊材无库存，请联系仓库保管员！";
return respone;
}
else
{
respone.code = 1;
return respone;
}
}
catch (Exception e)
{
respone.code = 0;
respone.message = e.Message;
}
return respone;
}
[HttpPost]
public Model.ResponeData addUsingPlan([FromBody] UsingPlanItem usingPlan)
{

1
HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs
View File

@ -165,6 +165,7 @@ namespace WebAPI.Filter
//"Weld*CanAudit",
//"Weld*addUsingPlan",
"Base*weldInfoList",
"Base*unitStoreList",
"Base*getWeldInfo",
"Base*baseUnitList",
"Base*usePositionList",

14
HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -79,13 +79,13 @@
<publishTime>09/10/2013 16:29:20</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>07/07/2025 18:58:25</publishTime>
<publishTime>07/25/2025 18:18:16</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>07/03/2024 11:01:05</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>07/07/2025 18:58:25</publishTime>
<publishTime>07/25/2025 18:18:16</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/17/2020 21:32:28</publishTime>
@ -115,10 +115,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>07/07/2025 18:58:24</publishTime>
<publishTime>07/25/2025 18:18:15</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>07/07/2025 18:58:24</publishTime>
<publishTime>07/25/2025 18:18:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>02/18/2018 09:44:54</publishTime>
@ -316,10 +316,10 @@
<publishTime>02/01/2018 12:20:56</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>07/07/2025 18:58:26</publishTime>
<publishTime>07/25/2025 18:18:17</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>07/07/2025 18:58:26</publishTime>
<publishTime>07/25/2025 18:18:17</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 13:57:34</publishTime>
@ -445,7 +445,7 @@
<publishTime>07/03/2024 11:01:07</publishTime>
</File>
<File Include="Web.config">
<publishTime>07/07/2025 18:58:35</publishTime>
<publishTime>07/25/2025 18:19:02</publishTime>
</File>
</ItemGroup>
</Project>

6
HJGL_DS/WebAPI/WebAPI.csproj
View File

@ -46,6 +46,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Linq" />
@ -66,9 +69,6 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.11.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http">
</Reference>
<Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

2
HJGL_DS/WebAPI/packages.config
View File

@ -22,6 +22,6 @@
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
<package id="Modernizr" version="2.8.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.1" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
<package id="WebGrease" version="1.6.0" targetFramework="net461" />
</packages>

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/.signature.p7s vendored Normal file
View File

Binary file not shown.

20
HJGL_DS/packages/Newtonsoft.Json.12.0.1/LICENSE.md vendored Normal file
View File

@ -0,0 +1,20 @@
The MIT License (MIT)
Copyright (c) 2007 James Newton-King
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/Newtonsoft.Json.12.0.1.nupkg vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net20/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net20/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

10157
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net20/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net35/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net35/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

9305
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net35/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net40/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net40/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

9505
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net40/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net45/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net45/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

11121
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/net45/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.0/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.0/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

10809
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.0/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.3/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.3/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

10931
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard1.3/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard2.0/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

11096
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/netstandard2.0/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

8869
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net40+sl5+win8+wp8+wpa81/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.dll vendored Normal file
View File

Binary file not shown.

BIN
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.pdb vendored Normal file
View File

Binary file not shown.

10809
HJGL_DS/packages/Newtonsoft.Json.12.0.1/lib/portable-net45+win8+wp8+wpa81/Newtonsoft.Json.xml vendored Normal file
View File

File diff suppressed because it is too large Load Diff