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

Merge branch 'master' of http://47.104.102.122:3000/shecs/ZHJA_HJGL

This commit is contained in:
高飞 2024-09-12 15:17:50 +08:00
parent d21b70cade 3c6f5460e6
commit 73e0c3f0b5
35 changed files with 701 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HJGL_ZH/BLL/.vs/BLL.csproj.dtbcache.json Normal file
View File

File diff suppressed because one or more lines are too long

4
HJGL_ZH/BLL/BLL.csproj
View File

@ -56,8 +56,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=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.1\lib\net40\NPOI.dll</HintPath>

6
HJGL_ZH/BLL/HJGL/TrustManage/HJGL_TrustManageEditService.cs
View File

@ -91,7 +91,11 @@ namespace BLL
var view = Funs.DB.HJGL_View_CH_TrustItem.FirstOrDefault(e => e.JOT_ID == jot_id && e.ProjectId == projectId);
return view;
}
public static List<Model.HJGL_View_CH_TrustItem> GetView_CH_TrustItemByProjectId( string projectId)
{
var view = Funs.DB.HJGL_View_CH_TrustItem.Where(e => e.ProjectId == projectId).ToList();
return view;
}
/// <summary>
/// 增加委托信息
/// </summary>

2
HJGL_ZH/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-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>

2
HJGL_ZH/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" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
<package id="NPOI" version="2.5.1" targetFramework="net40" />
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />

1
HJGL_ZH/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json Normal file
View File

File diff suppressed because one or more lines are too long

7
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -62,9 +62,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=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.1.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.1\lib\net40\NPOI.dll</HintPath>
@ -101,7 +100,7 @@
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="ThoughtWorks.QRCode">
<HintPath>..\..\..\New\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
<HintPath>..\..\..\..\ZHJA_HJGL\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

39
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
View File

@ -8,6 +8,7 @@ using BLL;
using System.Windows.Forms;
using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
using FineUIPro.Web.common.BaseInfo;
namespace FineUIPro.Web.HJGL.WeldingManage
{
@ -41,6 +42,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
#endregion
public static List<Model.HJGL_View_CH_TrustItem> trustItemList;
public static List<Model.HJGLPointManageCheckIsOk> hotPass_JOT_ID_List;
public static List<Model.HJGLPointManageCheckIsOk> hardPassList;
public static List<Model.HJGLPointManageCheckIsOk> HotProessTrustItemList;
public static List<Model.HJGLPointManageCheckIsOk> hotHardList;
#region 加载页面
/// <summary>
/// 加载页面
@ -108,6 +115,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//cbVI.HeaderText = "<i class=\"ui-icon f-grid-checkbox myheadercheckbox\"></i>&nbsp;外观检验";
//显示列
trustItemList = HJGL_TrustManageEditService.GetView_CH_TrustItemByProjectId(this.drpProjectId.SelectedValue);
hotPass_JOT_ID_List = (from x in Funs.DB.HJGL_View_CH_HotProessResult where x.ProjectId == drpProjectId.SelectedValue select new Model.HJGLPointManageCheckIsOk { Id = x.JOT_ID, IsOK = x.IsOK }).ToList();
hardPassList = (from x in Funs.DB.HJGL_View_CH_HardTestResult where x.ProjectId == drpProjectId.SelectedValue select new Model.HJGLPointManageCheckIsOk { Id = x.JOT_ID, IsOK = x.IsOK }).ToList();
HotProessTrustItemList = (from x in Funs.DB.HJGL_View_CH_HotProessTrustItem where x.ProjectId == drpProjectId.SelectedValue && x.TrustDate != null select new Model.HJGLPointManageCheckIsOk { Id = x.JOT_ID, IsOK = x.IsOK }).ToList();
hotHardList = (from x in Funs.DB.HJGL_CH_HardTestReportItem select new Model.HJGLPointManageCheckIsOk { Id = x.JOT_ID }).ToList();
Model.Sys_UserShowColumns c = BLL.Sys_UserShowColumnsService.GetColumnsByUserId(this.CurrUser.UserId, "P");
if (c != null)
{
@ -1239,7 +1255,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
if (!string.IsNullOrEmpty(batchDetail.JOT_ID))
{
//委托日期
var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId);
//var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId);
//if (trustItem != null)
//{
// var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
// if (trust != null)
// {
// if (trust.CH_TrustDate != null)
// {
// lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
// }
// }
var trustItem = trustItemList.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
if (trustItem != null)
{
var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
@ -1247,13 +1274,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (trust.CH_TrustDate != null)
{
lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
}
}
}
//热处理合格
var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
var hotPass = hotPass_JOT_ID_List.FirstOrDefault(x => x .Id== batchDetail.JOT_ID);
if (hotPass != null)
{
if (hotPass.IsOK == true)
@ -1262,7 +1289,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
//硬度合格
var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
var hardPass = hardPassList.FirstOrDefault(x => x.Id == batchDetail.JOT_ID );
if (hardPass != null)
{
if (hardPass.IsOK == true)
@ -1271,13 +1298,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
//是否热处理
var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null);
var hotProessTrustItem = HotProessTrustItemList.FirstOrDefault(x => x.Id == batchDetail.JOT_ID );
if (hotProessTrustItem != null)
{
cbHotTrust.Checked = true;
}
//硬度委托
var hotHard = Funs.DB.HJGL_CH_HardTestReportItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
var hotHard = hotHardList.FirstOrDefault(x => x.Id == batchDetail.JOT_ID);
if (hotHard != null)
{
cbHotHard.Checked = true;

143
HJGL_ZH/FineUIPro.Web/Web.config Normal file
View File

@ -0,0 +1,143 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<configSections>
<section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
</configSections>
<FineUIPro DebugMode="false" Theme="Cupertino" />
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\sql2016;Database=HJGLDB_NEW;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/;" />
<add key="aspnet:MaxHttpCollectionKeys" value="50000" />
<add key="SystemVersion" value="SGGLPackFile_V2017-03-30-001" />
<add key="ADomainUrl" value="10.151.130.1" />
<add key="APPUrl" value="https://www.pgyer.com/pWSd" />
<!--系统:焊接管理为：HJGL,焊材管理：HJCLGL-->
<add key="SystemCode" value="HJCLGL" />
<add key="http" value="http://localhost/test/" />
</appSettings>
<system.web>
<!-- 会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
<sessionState mode="InProc" cookieless="UseCookies" timeout="1200" />
<!--<processModel enable="true" requestQueueLimit="100000"/>-->
<pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
<controls>
<add tagPrefix="f" namespace="FineUIPro" assembly="FineUIPro" />
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</controls>
</pages>
<httpModules>
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
</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" />
</httpHandlers>
<compilation debug="true" targetFramework="4.0">
<assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies>
</compilation>
<httpRuntime requestValidationMode="2.0" maxRequestLength="999999999" maxQueryStringLength="2097151" executionTimeout="36000" />
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" />
</authentication>
<membership>
<providers>
<clear />
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
</providers>
</membership>
<profile>
<providers>
<clear />
<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
</providers>
</profile>
<roleManager enabled="false">
<providers>
<clear />
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
<add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
</providers>
</roleManager>
<customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" />
<webServices>
<protocols>
<add name="HttpSoap" />
<add name="HttpPost" />
<add name="HttpGet" />
<add name="Documentation" />
</protocols>
</webServices>
</system.web>
<location path="res.axd" />
<system.webServer>
<staticContent>
<mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
<mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
</staticContent>
<validation validateIntegratedModeConfiguration="false" />
<modules runAllManagedModulesForAllRequests="true">
<add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
<remove name="ScriptModule" />
<add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</modules>
<handlers>
<remove name="ChartImageHandler" />
<add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" />
<add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
</handlers>
<defaultDocument>
<files>
<add value="Login.aspx" />
</files>
</defaultDocument>
<security>
<requestFiltering>
<requestLimits maxAllowedContentLength="2147483647" maxQueryString="2147483647" />
</requestFiltering>
</security>
</system.webServer>
<!-- SERVER -->
<system.serviceModel>
<serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
<services>
<service name="BLL.OpenService.HSSEService" behaviorConfiguration="HSSEServiceBehavior">
<endpoint address="" binding="wsHttpBinding" bindingConfiguration="HSSEServiceBinding" name="HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" />
</service>
</services>
<behaviors>
<serviceBehaviors>
<behavior name="HSSEServiceBehavior">
<serviceMetadata httpGetEnabled="true" />
<serviceDebug includeExceptionDetailInFaults="false" />
<serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
</behavior>
</serviceBehaviors>
</behaviors>
<bindings>
<wsHttpBinding>
<binding name="HSSEServiceBinding" maxReceivedMessageSize="2147483647" useDefaultWebProxy="false" maxBufferPoolSize="2147483647" closeTimeout="20:00:00" openTimeout="00:01:10" receiveTimeout="20:00:00" sendTimeout="20:00:00">
<readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="409600" maxNameTableCharCount="2147483647" />
<security mode="None" />
</binding>
</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-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

16
HJGL_ZH/FineUIPro.Web/Welder/FilmInfoQuery.aspx.cs
View File

@ -6,6 +6,7 @@ using System.Data.SqlClient;
using System.Text;
using AspNet = System.Web.UI.WebControls;
using BLL;
using System.Diagnostics;
namespace FineUIPro.Web.Welder
{
@ -29,6 +30,8 @@ namespace FineUIPro.Web.Welder
this.drpUnit.DataBind();
Funs.FineUIPleaseSelect(this.drpUnit);
txtStartDate.SelectedDate = DateTime.Now.AddDays(-30).Date;
txtEndDate.SelectedDate = DateTime.Now.Date;
// 绑定表格
BindGrid();
}
@ -36,7 +39,11 @@ namespace FineUIPro.Web.Welder
private void BindGrid()
{
List<SqlParameter> listStr = new List<SqlParameter>();
List<SqlParameter> listStr = new List<SqlParameter>
{
/* new SqlParameter("@pageIndex", Grid1.PageIndex+1),
new SqlParameter("@pageSize", Grid1.PageSize)*/
};
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitId", this.drpUnit.SelectedValue));
@ -65,12 +72,19 @@ namespace FineUIPro.Web.Welder
}
SqlParameter[] parameter = listStr.ToArray();
Stopwatch sw = new Stopwatch();
sw.Start();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_FilmInfo", parameter);
this.Grid1.RecordCount = tb.Rows.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
sw.Stop();
TimeSpan dt = sw.Elapsed;
}
#region 页索引改变事件

12
HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
View File

@ -72,20 +72,22 @@ namespace FineUIPro.Web.common.ProjectSet
{
//string unitid = this.tvUnit.SelectedNodeID;
string strSql = @"SELECT WED_ID,WED_Code, WED_Name FROM dbo.HJGL_BS_Welder
WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
AND IsOAM=1";
string strSql = @"SELECT W.WED_ID, W.WED_Code, W.WED_Name
FROM dbo.HJGL_BS_Welder W
LEFT JOIN Project_Welder PW ON W.WED_ID = PW.WED_ID AND PW.ProjectId = @ProjectId
WHERE PW.WED_ID IS NULL
AND W.IsOAM = 1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
if (!string.IsNullOrEmpty(txtWeldCode.Text))
{
strSql += " AND WED_Code LIKE @WED_Code";
strSql += " AND W.WED_Code LIKE @WED_Code";
listStr.Add(new SqlParameter("@WED_Code", "%" + this.txtWeldCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWeldName.Text))
{
strSql += " AND WED_Name LIKE @WED_Name";
strSql += " AND W.WED_Name LIKE @WED_Name";
listStr.Add(new SqlParameter("@WED_Name", "%" + this.txtWeldName.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();

126
HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs
View File

@ -8,6 +8,7 @@ using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
using System.Text;
using System.Threading.Tasks;
namespace FineUIPro.Web.common
{
@ -24,40 +25,49 @@ namespace FineUIPro.Web.common
this.drpProject.DataBind();
Funs.FineUIPleaseSelect(this.drpProject);
this.drpProject.SelectedValue = this.CurrUser.LoginProjectId;
//更新要求完成日期
List<Model.HJGL_BO_Batch> batchLists = (from x in Funs.DB.HJGL_BO_Batch
where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
select x).ToList();
//委托单不为null且 对应批明细的委托单明细状态为2
List<Model.HJGL_BO_Batch> Allbatch = (from x in Funs.DB.HJGL_BO_Batch
where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
select x).ToList();
var batchdetails = from x in Funs.DB.HJGL_BO_BatchDetail
join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
where y.ProjectId == this.drpProject.SelectedValue
select x;
where y.ProjectId == this.drpProject.SelectedValue && !y.AskCompleteDate.HasValue
select x; //获取所以批明细
var trustdetails = from x in Funs.DB.HJGL_CH_TrustItem
join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchDetailId equals y.BatchDetailId
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
where z.ProjectId == this.drpProject.SelectedValue
select x;
foreach (var item in batchLists)
{
bool isCheck = true;
var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId;
var trust = BLL.HJGL_TrustManageEditService.GetTrustByBatchId(item.BatchId);
var ndtr = BLL.HJGL_DetectionService.GetNDTRateByNDTRID(item.NDTR_ID);
join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
where z.ProjectId == this.drpProject.SelectedValue && !z.AskCompleteDate.HasValue
select x; //获取所有批明细对应委托明细
List<Model.HJGL_BO_Batch> batchLists2 = (from x in Allbatch
join m in Funs.DB.HJGL_BS_NDTRate on x.NDTR_ID equals m.NDTR_ID
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
from t in g.DefaultIfEmpty()
where m.NDTR_Rate.Value==0 && t==null
select x).Distinct().ToList(); //获取委托单为null且检测比例是0的
var batchLists = (from x in Allbatch
join n in Funs.DB.HJGL_CH_Trust on x.BatchId equals n.BatchId into g
select x).Distinct().ToList();
var batchdetailsList = batchdetails.ToList();
var trustdetailsList = trustdetails.ToList();
var batchLists4 = (
from x in batchLists
join y in batchdetailsList on x.BatchId equals y.BatchId
join m in trustdetailsList on y.BatchDetailId equals m.BatchDetailId
group new { x, m } by x into g
where g.All(item => item.m.States == "2")
select g.First().x
).Distinct().ToList();
batchLists2.AddRange(batchLists4);
batchLists2= batchLists2.Distinct().ToList();
foreach (var item in batchLists2)
{
var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId; //获取批次详情ID
var trustdetail = from x in trustdetails where batchdetail.Contains(x.BatchDetailId) orderby x.FeedbackDate descending select x;
if (trust == null && ndtr.NDTR_Rate.Value != 0)
{
isCheck = false;
}
else
{
if (trustdetail.Where(x => x.States != "2").Count() > 0)
{
isCheck = false;
}
}
//检测合格，更新要求完成日期
if (isCheck && item.BatchIsClosed == true)
if ( item.BatchIsClosed == true)
{
DateTime date = DateTime.Now;
if (trustdetail.Count() > 0)
{
@ -70,6 +80,65 @@ namespace FineUIPro.Web.common
BLL.HJGL_BO_BatchService.UpdateBatch(item);
}
}
#region 旧代码
//List<Model.HJGL_BO_Batch> batchLists3= new List<Model.HJGL_BO_Batch>();
//List<Model.HJGL_BO_Batch> batchLists = (from x in Funs.DB.HJGL_BO_Batch
// where x.ProjectId == this.drpProject.SelectedValue && !x.AskCompleteDate.HasValue
// select x).ToList();
//var batchdetails = from x in Funs.DB.HJGL_BO_BatchDetail
// join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId
// where y.ProjectId == this.drpProject.SelectedValue
// select x; //获取所以批明细
//var trustdetails = from x in Funs.DB.HJGL_CH_TrustItem
// join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchDetailId equals y.BatchDetailId
// join z in Funs.DB.HJGL_BO_Batch on y.BatchId equals z.BatchId
// where z.ProjectId == this.drpProject.SelectedValue
// select x; //获取所有批明细对应委托明细
//foreach (var item in batchLists)
//{
// bool isCheck = true;
// var batchdetail = from x in batchdetails where x.BatchId == item.BatchId select x.BatchDetailId; //获取批次详情ID
// //var trust = BLL.HJGL_TrustManageEditService.GetTrustByBatchId(item.BatchId); //根据批Id获取委托信息
// var trust = Funs.DB.HJGL_CH_Trust.FirstOrDefault(x => x.BatchId == item.BatchId); //根据批Id获取委托信息
// var ndtr = Funs.DB.HJGL_BS_NDTRate.FirstOrDefault(x => x.NDTR_ID == item.NDTR_ID); //根据探伤比例Id获取探伤比例
// var trustdetail = from x in trustdetails where batchdetail.Contains(x.BatchDetailId) orderby x.FeedbackDate descending select x;
// if (trust == null && ndtr.NDTR_Rate.Value != 0)
// {
// isCheck = false;
// }
// else
// {
// if (trustdetail.Any(x => x.States != "2"))
// {
// isCheck = false;
// }
// }
// if (isCheck)
// {
// batchLists3.Add(item);
// }
// //检测合格，更新要求完成日期
// if (isCheck && item.BatchIsClosed == true)
// {
// DateTime date = DateTime.Now;
// if (trustdetail.Count() > 0)
// {
// if (trustdetail.FirstOrDefault().FeedbackDate != null)
// {
// date = trustdetail.FirstOrDefault().FeedbackDate.Value;
// }
// }
// item.AskCompleteDate = date;
// BLL.HJGL_BO_BatchService.UpdateBatch(item);
// }
//}
#endregion
BindProject();
BindBatch();
//BindGetWelder();
@ -80,8 +149,7 @@ namespace FineUIPro.Web.common
//BindCheckNoAudit();
}
}
#region 绑定数据
#region 绑定数据
/// <summary>
/// 绑定项目数据
/// </summary>

10
HJGL_ZH/FineUIPro.Web/default.aspx
View File

@ -499,11 +499,11 @@
F.initTreeTabStrip(mainMenu, mainTabStrip, null, true, false, false);
var themeTitle = F.cookie('Theme_Pro_Title');
if (themeTitle) {
F.removeCookie('Theme_Pro_Title');
notify('主题更改为：' + themeTitle);
}
//var themeTitle = F.cookie('Theme_Pro_Title');
//if (themeTitle) {
// F.removeCookie('Theme_Pro_Title');
// notify('主题更改为：' + themeTitle);
//}
});

3
HJGL_ZH/FineUIPro.Web/packages.config
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
<package id="NPOI" version="2.5.1" targetFramework="net40" />
<package id="Portable.BouncyCastle" version="1.8.6" targetFramework="net40" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net40" />
<package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" />
</packages>

1
HJGL_ZH/Model/.vs/Model.csproj.dtbcache.json Normal file
View File

File diff suppressed because one or more lines are too long

8
HJGL_ZH/Model/HJGL/HJGLPointManageCheckIsOk.cs Normal file
View File

@ -0,0 +1,8 @@
namespace Model
{
public class HJGLPointManageCheckIsOk
{
public string Id { get; set; }
public bool? IsOK { get; set; }
}
}

1
HJGL_ZH/Model/Model.csproj
View File

@ -74,6 +74,7 @@
<Compile Include="ErrorInfo.cs" />
<Compile Include="GJSX\SpGetInfoCount.cs" />
<Compile Include="HandleStep.cs" />
<Compile Include="HJGL\HJGLPointManageCheckIsOk.cs" />
<Compile Include="HJGL\HJGL_SpRptBawZlfx.cs" />
<Compile Include="HJGL\HJGL_SpRptIsoAnalyze.cs" />
<Compile Include="HJGL\HJGL_SpRptIsoYzazjd.cs" />

BIN
HJGL_ZH/Model/bin/Debug/Model.dll
View File

Binary file not shown.

BIN
HJGL_ZH/Model/bin/Debug/Model.pdb
View File

Binary file not shown.

BIN
HJGL_ZH/Model/bin/Release/Model.dll
View File

Binary file not shown.

BIN
HJGL_ZH/Model/bin/Release/Model.pdb
View File

Binary file not shown.

4
HJGL_ZH/Model/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

BIN
HJGL_ZH/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
HJGL_ZH/Model/obj/Debug/Model.csproj.AssemblyReference.cache Normal file
View File

Binary file not shown.

2
HJGL_ZH/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
e79886e1ca69bd8aba927a01a3b5f2b1225fe06f
57339f4a363b9faca664a99231f321d7a604e379b8ea1faf26c3882a6bc59476

6
HJGL_ZH/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
View File

@ -187,3 +187,9 @@ E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cach
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.dll
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.pdb
E:\MyProject\ZHHJ\JA\HJGL_ZH\Model\obj\Debug\Model.csprojAssemblyReference.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.dll
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\bin\Debug\Model.pdb
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.AssemblyReference.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.csproj.CoreCompileInputs.cache
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.dll
D:\数据\诺必达\镇海建安\ZHJA_HJGL\HJGL_ZH\Model\obj\Debug\Model.pdb

BIN
HJGL_ZH/Model/obj/Debug/Model.dll
View File

Binary file not shown.

BIN
HJGL_ZH/Model/obj/Debug/Model.pdb
View File

Binary file not shown.

4
HJGL_ZH/Model/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs Normal file
View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

BIN
HJGL_ZH/Model/obj/Release/Model.csproj.AssemblyReference.cache Normal file
View File

Binary file not shown.

3
HJGL_ZH/SGGL.sln.DotSettings.user Normal file
View File

@ -0,0 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/IdeIntegrationViewOptions/FilterSnapshotsBySolution/@EntryValue">True</s:Boolean>
<s:String x:Key="/Default/Profiling/Configurations/=1/@EntryIndexedValue">&lt;data&gt;&lt;HostParameters type="LocalHostParameters" /&gt;&lt;Info type="TimelineInfo" /&gt;&lt;CoreOptions type="CoreOptions"&gt;&lt;CoreTempPath IsNull="False"&gt;&lt;/CoreTempPath&gt;&lt;RemoteEndPoint IsNull="False"&gt;&lt;/RemoteEndPoint&gt;&lt;AdditionalEnvironmentVariables /&gt;&lt;/CoreOptions&gt;&lt;HostOptions type="HostOptions"&gt;&lt;HostTempPath IsNull="False"&gt;&lt;/HostTempPath&gt;&lt;/HostOptions&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>

268
HJGL_ZH/UpgradeLog.htm Normal file
View File

@ -0,0 +1,268 @@
<!DOCTYPE html>
<!-- saved from url=(0014)about:internet -->
<html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="ConversionReport0">
迁移报告
</title><style>
/* Body style, for the entire document */
body
{
background: #F3F3F4;
color: #1E1E1F;
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
padding: 0;
margin: 0;
}
/* Header1 style, used for the main title */
h1
{
padding: 10px 0px 10px 10px;
font-size: 21pt;
background-color: #E2E2E2;
border-bottom: 1px #C1C1C2 solid;
color: #201F20;
margin: 0;
font-weight: normal;
}
/* Header2 style, used for "Overview" and other sections */
h2
{
font-size: 18pt;
font-weight: normal;
padding: 15px 0 5px 0;
margin: 0;
}
/* Header3 style, used for sub-sections, such as project name */
h3
{
font-weight: normal;
font-size: 15pt;
margin: 0;
padding: 15px 0 5px 0;
background-color: transparent;
}
/* Color all hyperlinks one color */
a
{
color: #1382CE;
}
/* Table styles */
table
{
border-spacing: 0 0;
border-collapse: collapse;
font-size: 10pt;
}
table th
{
background: #E7E7E8;
text-align: left;
text-decoration: none;
font-weight: normal;
padding: 3px 6px 3px 6px;
}
table td
{
vertical-align: top;
padding: 3px 6px 5px 5px;
margin: 0px;
border: 1px solid #E7E7E8;
background: #F7F7F8;
}
/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
.localLink
{
color: #1E1E1F;
background: #EEEEED;
text-decoration: none;
}
.localLink:hover
{
color: #1382CE;
background: #FFFF99;
text-decoration: none;
}
/* Center text, used in the over views cells that contain message level counts */
.textCentered
{
text-align: center;
}
/* The message cells in message tables should take up all avaliable space */
.messageCell
{
width: 100%;
}
/* Padding around the content after the h1 */
#content
{
padding: 0px 12px 12px 12px;
}
/* The overview table expands to width, with a max width of 97% */
#overview table
{
width: auto;
max-width: 75%;
}
/* The messages tables are always 97% width */
#messages table
{
width: 97%;
}
/* All Icons */
.IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
{
min-width:18px;
min-height:18px;
background-repeat:no-repeat;
background-position:center;
}
/* Success icon encoded */
.IconSuccessEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconSuccess#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
}
/* Information icon encoded */
.IconInfoEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconInformation#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
}
/* Warning icon encoded */
.IconWarningEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconWarning#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
}
/* Error icon encoded */
.IconErrorEncoded
{
/* Note: Do not delete the comment below. It is used to verify the correctness of the encoded image resource below before the product is released */
/* [---XsltValidateInternal-Base64EncodedImage:IconError#Begin#background-image: url(data:image/png;base64,#Separator#);#End#] */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
}
</style><script type="text/javascript" language="javascript">
// Startup
// Hook up the the loaded event for the document/window, to linkify the document content
var startupFunction = function() { linkifyElement("messages"); };
if(window.attachEvent)
{
window.attachEvent('onload', startupFunction);
}
else if (window.addEventListener)
{
window.addEventListener('load', startupFunction, false);
}
else
{
document.addEventListener('load', startupFunction, false);
}
// Toggles the visibility of table rows with the specified name
function toggleTableRowsByName(name)
{
var allRows = document.getElementsByTagName('tr');
for (i=0; i < allRows.length; i++)
{
var currentName = allRows[i].getAttribute('name');
if(!!currentName && currentName.indexOf(name) == 0)
{
var isVisible = allRows[i].style.display == '';
isVisible ? allRows[i].style.display = 'none' : allRows[i].style.display = '';
}
}
}
function scrollToFirstVisibleRow(name)
{
var allRows = document.getElementsByTagName('tr');
for (i=0; i < allRows.length; i++)
{
var currentName = allRows[i].getAttribute('name');
var isVisible = allRows[i].style.display == '';
if(!!currentName && currentName.indexOf(name) == 0 && isVisible)
{
allRows[i].scrollIntoView(true);
return true;
}
}
return false;
}
// Linkifies the specified text content, replaces candidate links with html links
function linkify(text)
{
if(!text || 0 === text.length)
{
return text;
}
// Find http, https and ftp links and replace them with hyper links
var urlLink = /(http|https|ftp)\:\/\/[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?\/?([a-zA-Z0-9\-\._\?\,\/\\\+&%\$#\=~;\{\}])*/gi;
return text.replace(urlLink, '<a href="$&">$&</a>') ;
}
// Linkifies the specified element by ID
function linkifyElement(id)
{
var element = document.getElementById(id);
if(!!element)
{
element.innerHTML = linkify(element.innerHTML);
}
}
function ToggleMessageVisibility(projectName)
{
if(!projectName || 0 === projectName.length)
{
return;
}
toggleTableRowsByName("MessageRowClass" + projectName);
toggleTableRowsByName('MessageRowHeaderShow' + projectName);
toggleTableRowsByName('MessageRowHeaderHide' + projectName);
}
function ScrollToFirstVisibleMessage(projectName)
{
if(!projectName || 0 === projectName.length)
{
return;
}
// First try the 'Show messages' row
if(!scrollToFirstVisibleRow('MessageRowHeaderShow' + projectName))
{
// Failed to find a visible row for 'Show messages', try an actual message row
scrollToFirstVisibleRow('MessageRowClass' + projectName);
}
}
</script></head><body><h1 _locID="ConversionReport">
迁移报告 - </h1><div id="content"><h2 _locID="OverviewTitle">概述</h2><div id="overview"><table><tr><th></th><th _locID="ProjectTableHeader">项目</th><th _locID="PathTableHeader">路径</th><th _locID="ErrorsTableHeader">错误</th><th _locID="WarningsTableHeader">警告</th><th _locID="MessagesTableHeader">消息</th></tr><tr><td class="IconErrorEncoded" /><td><strong><a href="#FineUIPro.Web">FineUIPro.Web</a></strong></td><td>FineUIPro.Web\FineUIPro.Web.csproj</td><td class="textCentered"><a href="#FineUIPro.WebError">1</a></td><td class="textCentered"><a>0</a></td><td class="textCentered"><a href="#">0</a></td></tr></table></div><h2 _locID="SolutionAndProjectsTitle">解决方案和项目</h2><div id="messages"><a name="FineUIPro.Web" /><h3>FineUIPro.Web</h3><table><tr id="FineUIPro.WebHeaderRow"><th></th><th class="messageCell" _locID="MessageTableHeader">消息</th></tr><tr name="ErrorRowClassFineUIPro.Web"><td class="IconErrorEncoded"><a name="FineUIPro.WebError" /></td><td class="messageCell"><strong>FineUIPro.Web\FineUIPro.Web.csproj:
</strong><span>行 -1767916016 出错。应为“ENCODING”，却发现是“utf-8”。</span></td></tr></table></div></div></body></html>

1
HJGL_ZH/WebAPI/.vs/WebAPI.csproj.dtbcache.json Normal file
View File

@ -0,0 +1 @@
{"RootPath":"D:\\数据\\诺必达\\镇海建安\\ZHJA_HJGL\\HJGL_ZH\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\数据\\诺必达\\镇海建安\\ZHJA_HJGL\\HJGL_ZH\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"D:\\数据\\诺必达\\镇海建安\\ZHJA_HJGL\\HJGL_ZH\\WebAPI\\bin\\WebAPI.pdb","OutputItemRelativePath":"WebAPI.pdb"}],"CopyToOutputEntries":[]}

87
HJGL_ZH/WebAPI/Web.config Normal file
View File

@ -0,0 +1,87 @@
<?xml version="1.0"?>
<!--
有关如何配置 ASP.NET 应用程序的详细信息，请访问
https://go.microsoft.com/fwlink/?LinkId=301879
-->
<configuration>
<appSettings>
<add key="webpages:Version" value="3.0.0.0"/>
<add key="webpages:Enabled" value="false"/>
<add key="ClientValidationEnabled" value="true"/>
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.;Database=HJGLDB_ZHJAN;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--版本号-->
<add key="SystemVersion" value="WebApi_V2022-10-07-001"/>
<!--附件上传物理路径-->
<add key="localRoot" value="D:\HJGL\HJGL\FineUIPro.Web\"/>
<!--每页数量-->
<add key="PageSize" value="15"/>
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
可在 <httpRuntime> 标记上设置以下特性。
<system.Web>
<httpRuntime targetFramework="4.6.1" />
</system.Web>
-->
<system.web>
<compilation debug="false" targetFramework="4.6.1"/>
<httpRuntime targetFramework="4.6.1"/>
</system.web>
<system.webServer>
<!-- 跨域访问必须添加 -->
<httpProtocol>
<customHeaders>
<add name="Access-Control-Allow-Origin" value="*"/>
<add name="Access-Control-Allow-Headers" value="Content-Type"/>
<add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
</customHeaders>
</httpProtocol>
<handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
<remove name="OPTIONSVerbHandler"/>
<remove name="TRACEVerbHandler"/>
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
</handlers>
</system.webServer>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
<bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
</compilers>
</system.codedom>
</configuration>

5
HJGL_ZH/WebAPI/WebAPI.csproj
View File

@ -14,7 +14,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebAPI</RootNamespace>
<AssemblyName>WebAPI</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
@ -49,14 +49,12 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.Routing" />
@ -110,7 +108,6 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.4\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="WebGrease">
<Private>True</Private>
<HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>