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

11

This commit is contained in:
佘春生 2024-10-21 15:49:55 +08:00
parent 569948f958
commit bafdaa6c9f
19 changed files with 1009 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
HJGL_ZH/BLL/WeldMat/BaseInfo/UnitStoreService.cs
View File

@ -35,6 +35,7 @@ namespace BLL
newUnitStore.UnitStoreCode = unitStore.UnitStoreCode; newUnitStore.UnitStoreCode = unitStore.UnitStoreCode;
newUnitStore.UnitStoreName = unitStore.UnitStoreName; newUnitStore.UnitStoreName = unitStore.UnitStoreName;
newUnitStore.StorePosition = unitStore.StorePosition; newUnitStore.StorePosition = unitStore.StorePosition;
newUnitStore.IsUse=unitStore.IsUse;
db.Weld_UnitStore.InsertOnSubmit(newUnitStore); db.Weld_UnitStore.InsertOnSubmit(newUnitStore);
db.SubmitChanges(); db.SubmitChanges();
} }
@ -53,6 +54,7 @@ namespace BLL
newUnitStore.UnitStoreCode = unitStore.UnitStoreCode; newUnitStore.UnitStoreCode = unitStore.UnitStoreCode;
newUnitStore.UnitStoreName = unitStore.UnitStoreName; newUnitStore.UnitStoreName = unitStore.UnitStoreName;
newUnitStore.StorePosition = unitStore.StorePosition; newUnitStore.StorePosition = unitStore.StorePosition;
newUnitStore.IsUse = unitStore.IsUse;
db.SubmitChanges(); db.SubmitChanges();
} }
} }
@ -93,6 +95,29 @@ namespace BLL
} }
public static void InitUnitStoreDropDownList(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease) public static void InitUnitStoreDropDownList(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
where x.IsUse==true
orderby y.UnitName, x.UnitStoreCode
select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + 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);
}
}
public static void InitUnitStoreAll(FineUIPro.DropDownList dropName, string unitId, bool isShowPlease)
{ {
var store = from x in Funs.DB.Weld_UnitStore var store = from x in Funs.DB.Weld_UnitStore
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId

2
HJGL_ZH/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
View File

File diff suppressed because one or more lines are too long

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

@ -99,8 +99,8 @@
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" /> <Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" /> <Reference Include="System.EnterpriseServices" />
<Reference Include="ThoughtWorks.QRCode"> <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\New\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath> <HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -261,8 +261,8 @@
<Content Include="common\WelderManage\PersonQualifiedProject.aspx" /> <Content Include="common\WelderManage\PersonQualifiedProject.aspx" />
<Content Include="common\WelderManage\PersonQualifiedProjectEdit.aspx" /> <Content Include="common\WelderManage\PersonQualifiedProjectEdit.aspx" />
<Content Include="common\WelderManage\PersonQualifiedProjectView.aspx" /> <Content Include="common\WelderManage\PersonQualifiedProjectView.aspx" />
<Content Include="common\WelderManage\WelderSave.aspx" />
<Content Include="common\WelderManage\SeeQRImage.aspx" /> <Content Include="common\WelderManage\SeeQRImage.aspx" />
<Content Include="common\WelderManage\WelderSave.aspx" />
<Content Include="common\WelderManage\WelderScoreEdit.aspx" /> <Content Include="common\WelderManage\WelderScoreEdit.aspx" />
<Content Include="config\ajax.aspx" /> <Content Include="config\ajax.aspx" />
<Content Include="config\ajax_properties.txt" /> <Content Include="config\ajax_properties.txt" />
@ -1253,6 +1253,7 @@
<Content Include="WeldMat\Recycle\RecycleMatTopEdit.aspx" /> <Content Include="WeldMat\Recycle\RecycleMatTopEdit.aspx" />
<Content Include="WeldMat\ReleaseRecovery\ReleaseRecovery.aspx" /> <Content Include="WeldMat\ReleaseRecovery\ReleaseRecovery.aspx" />
<Content Include="WeldMat\ReleaseRecovery\ReleaseRecoveryPrint.aspx" /> <Content Include="WeldMat\ReleaseRecovery\ReleaseRecoveryPrint.aspx" />
<Content Include="WeldMat\ReleaseRecovery\TimeOutNoReturn.aspx" />
<Content Include="WeldMat\ReleaseRecovery\WeldMatStatistics.aspx" /> <Content Include="WeldMat\ReleaseRecovery\WeldMatStatistics.aspx" />
<Content Include="WeldMat\ReleaseRecovery\WeldUseAmount.aspx" /> <Content Include="WeldMat\ReleaseRecovery\WeldUseAmount.aspx" />
<Content Include="WeldMat\Stock\ShowWeldInfo.aspx" /> <Content Include="WeldMat\Stock\ShowWeldInfo.aspx" />
@ -4591,13 +4592,6 @@
<Compile Include="common\WelderManage\PersonQualifiedProjectView.aspx.designer.cs"> <Compile Include="common\WelderManage\PersonQualifiedProjectView.aspx.designer.cs">
<DependentUpon>PersonQualifiedProjectView.aspx</DependentUpon> <DependentUpon>PersonQualifiedProjectView.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="common\WelderManage\WelderSave.aspx.cs">
<DependentUpon>WelderSave.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\WelderManage\WelderSave.aspx.designer.cs">
<DependentUpon>WelderSave.aspx</DependentUpon>
</Compile>
<Compile Include="common\WelderManage\SeeQRImage.aspx.cs"> <Compile Include="common\WelderManage\SeeQRImage.aspx.cs">
<DependentUpon>SeeQRImage.aspx</DependentUpon> <DependentUpon>SeeQRImage.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>
@ -4605,6 +4599,13 @@
<Compile Include="common\WelderManage\SeeQRImage.aspx.designer.cs"> <Compile Include="common\WelderManage\SeeQRImage.aspx.designer.cs">
<DependentUpon>SeeQRImage.aspx</DependentUpon> <DependentUpon>SeeQRImage.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="common\WelderManage\WelderSave.aspx.cs">
<DependentUpon>WelderSave.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="common\WelderManage\WelderSave.aspx.designer.cs">
<DependentUpon>WelderSave.aspx</DependentUpon>
</Compile>
<Compile Include="common\WelderManage\WelderScoreEdit.aspx.cs"> <Compile Include="common\WelderManage\WelderScoreEdit.aspx.cs">
<DependentUpon>WelderScoreEdit.aspx</DependentUpon> <DependentUpon>WelderScoreEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>
@ -6570,6 +6571,13 @@
<Compile Include="WeldMat\ReleaseRecovery\ReleaseRecoveryPrint.aspx.designer.cs"> <Compile Include="WeldMat\ReleaseRecovery\ReleaseRecoveryPrint.aspx.designer.cs">
<DependentUpon>ReleaseRecoveryPrint.aspx</DependentUpon> <DependentUpon>ReleaseRecoveryPrint.aspx</DependentUpon>
</Compile> </Compile>
<Compile Include="WeldMat\ReleaseRecovery\TimeOutNoReturn.aspx.cs">
<DependentUpon>TimeOutNoReturn.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WeldMat\ReleaseRecovery\TimeOutNoReturn.aspx.designer.cs">
<DependentUpon>TimeOutNoReturn.aspx</DependentUpon>
</Compile>
<Compile Include="WeldMat\ReleaseRecovery\WeldMatStatistics.aspx.cs"> <Compile Include="WeldMat\ReleaseRecovery\WeldMatStatistics.aspx.cs">
<DependentUpon>WeldMatStatistics.aspx</DependentUpon> <DependentUpon>WeldMatStatistics.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType> <SubType>ASPXCodeBehind</SubType>

4
HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectView>ProjectFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

110
HJGL_ZH/FineUIPro.Web/Web.config
View File

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

5
HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx
View File

@ -46,6 +46,8 @@
HeaderText="仓库位置" HeaderTextAlign="Center" TextAlign="Left" SortField="StorePosition" HeaderText="仓库位置" HeaderTextAlign="Center" TextAlign="Left" SortField="StorePosition"
ExpandUnusedSpace="true"> ExpandUnusedSpace="true">
</f:RenderField> </f:RenderField>
<f:RenderCheckField Width="80px" ColumnID="IsUse" DataField="IsUse" HeaderText="是否启用">
</f:RenderCheckField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="rowselect" Handler="onGridRowSelect" /> <f:Listener Event="rowselect" Handler="onGridRowSelect" />
@ -82,6 +84,7 @@
<f:TextBox ID="txtStorePosition" Label="仓库位置" runat="server" <f:TextBox ID="txtStorePosition" Label="仓库位置" runat="server"
LabelAlign="right" MaxLength="50"> LabelAlign="right" MaxLength="50">
</f:TextBox> </f:TextBox>
<f:CheckBox ID="cbIsUse" Label="是否启用" runat="server" LabelAlign="right"/>
</Items> </Items>
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server"> <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
@ -136,6 +139,7 @@
var txtUnitStoreCodeClientID = '<%= txtUnitStoreCode.ClientID %>'; var txtUnitStoreCodeClientID = '<%= txtUnitStoreCode.ClientID %>';
var txtUnitStoreNameClientID = '<%= txtUnitStoreName.ClientID %>'; var txtUnitStoreNameClientID = '<%= txtUnitStoreName.ClientID %>';
var txtStorePositionClientID = '<%= txtStorePosition.ClientID %>'; var txtStorePositionClientID = '<%= txtStorePosition.ClientID %>';
var cbIsUseClientID = '<%= cbIsUse.ClientID %>';
function onGridRowSelect(event, rowId) { function onGridRowSelect(event, rowId) {
var grid = F(gridClientID); var grid = F(gridClientID);
@ -152,6 +156,7 @@
F(txtUnitStoreCodeClientID).setValue(rowValue['UnitStoreCode']); F(txtUnitStoreCodeClientID).setValue(rowValue['UnitStoreCode']);
F(txtUnitStoreNameClientID).setValue(rowValue['UnitStoreName']); F(txtUnitStoreNameClientID).setValue(rowValue['UnitStoreName']);
F(txtStorePositionClientID).setValue(rowValue['tStorePosition']); F(txtStorePositionClientID).setValue(rowValue['tStorePosition']);
F(cbIsUseClientID).setValue(rowValue['cbIsUse']);
// 更新提交按钮文本 // 更新提交按钮文本
F(btnSaveClientID).setText('提交数据（编辑）'); F(btnSaveClientID).setText('提交数据（编辑）');

19
HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.cs
View File

@ -51,7 +51,7 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = @"SELECT s.UnitStoreId,s.UnitId,s.UnitStoreCode,s.UnitStoreName,s.StorePosition ,u.UnitName string strSql = @"SELECT s.UnitStoreId,s.UnitId,s.UnitStoreCode,s.UnitStoreName,s.StorePosition ,u.UnitName ,s.IsUse
FROM dbo.Weld_UnitStore s FROM dbo.Weld_UnitStore s
LEFT JOIN dbo.Base_Unit u ON u.UnitId = s.UnitId LEFT JOIN dbo.Base_Unit u ON u.UnitId = s.UnitId
WHERE 1=1"; WHERE 1=1";
@ -235,6 +235,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
this.txtUnitStoreCode.Text = unitStore.UnitStoreCode; this.txtUnitStoreCode.Text = unitStore.UnitStoreCode;
this.txtUnitStoreName.Text = unitStore.UnitStoreName; this.txtUnitStoreName.Text = unitStore.UnitStoreName;
txtStorePosition.Text = unitStore.StorePosition; txtStorePosition.Text = unitStore.StorePosition;
if (unitStore.IsUse == true)
{
cbIsUse.Checked = true;
}
else
{
cbIsUse.Checked = false;
}
hfFormID.Text = Id; hfFormID.Text = Id;
this.btnDelete.Enabled = true; this.btnDelete.Enabled = true;
@ -269,6 +278,14 @@ namespace FineUIPro.Web.WeldMat.BaseInfo
store.UnitStoreCode = this.txtUnitStoreCode.Text.Trim(); store.UnitStoreCode = this.txtUnitStoreCode.Text.Trim();
store.UnitStoreName = this.txtUnitStoreName.Text.Trim(); store.UnitStoreName = this.txtUnitStoreName.Text.Trim();
store.StorePosition = txtStorePosition.Text.Trim(); store.StorePosition = txtStorePosition.Text.Trim();
if (cbIsUse.Checked == true)
{
store.IsUse = true;
}
else
{
store.IsUse = false;
}
if (string.IsNullOrEmpty(strRowID)) if (string.IsNullOrEmpty(strRowID))
{ {
var stores = BLL.UnitStoreService.GetUnitStoreByUnitId(drpUnitId.SelectedValue); var stores = BLL.UnitStoreService.GetUnitStoreByUnitId(drpUnitId.SelectedValue);

15
HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/UnitStore.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.BaseInfo { namespace FineUIPro.Web.WeldMat.BaseInfo
{
public partial class UnitStore { public partial class UnitStore
{
/// <summary> /// <summary>
/// form1 控件。 /// form1 控件。
@ -147,6 +149,15 @@ namespace FineUIPro.Web.WeldMat.BaseInfo {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtStorePosition; protected global::FineUIPro.TextBox txtStorePosition;
/// <summary>
/// cbIsUse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsUse;
/// <summary> /// <summary>
/// Toolbar1 控件。 /// Toolbar1 控件。
/// </summary> /// </summary>

114
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/TimeOutNoReturn.aspx Normal file
View File

@ -0,0 +1,114 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TimeOutNoReturn.aspx.cs" Inherits="FineUIPro.Web.WeldMat.ReleaseRecovery.TimeOutNoReturn" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" />
<f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
<Regions>
<f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
BodyPadding="0 5 0 0" Layout="VBox" runat="server" EnableCollapse="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:DropDownList ID="drpProject" runat="server" Label="施工号" Width="240px" LabelAlign="right" LabelWidth="80px" EnableEdit="true"></f:DropDownList>
<f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件"
Width="220px" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:TextBox runat="server" Label="领用单位" ID="txtUnitName" EmptyText="输入查询条件"
Width="220px" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:TextBox runat="server" Label="焊工号" ID="txtWEDCode" EmptyText="输入查询条件"
Width="220px" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:TextBox runat="server" Label="焊工姓名" ID="txtWEDName" EmptyText="输入查询条件"
Width="220px" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:ToolbarFill ID="ToolbarFill2" runat="server">
</f:ToolbarFill>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Bottom" runat="server" ToolbarAlign="Right">
<Items>
<f:TextBox runat="server" Label="焊工班组" ID="txtTeamGroupName" EmptyText="输入查询条件"
Width="240px" LabelAlign="right" LabelWidth="80px">
</f:TextBox>
<f:DatePicker runat="server" Label="领用时间" ID="txtStarTime" LabelWidth="100px" LabelAlign="right" Width="230px"></f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="txtEndTime" LabelWidth="30px" Width="160px"></f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Region>
<f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="超时未退库统计" EnableCollapse="true"
runat="server" BoxFlex="1" EnableColumnLines="true"
AllowSorting="true" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
OnPageIndexChange="Grid1_PageIndexChange">
<Columns>
<f:RenderField HeaderText="施工号" ColumnID="ProjectCode" DataField="ProjectCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="领用单位" ColumnID="UnitName" DataField="UnitName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="焊工号" ColumnID="WED_Code" DataField="WED_Code"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊工姓名" ColumnID="WED_Name" DataField="WED_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊工班组" ColumnID="TeamGroupName" DataField="TeamGroupName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊材牌号" ColumnID="WeldName" DataField="WeldName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="焊材规格" ColumnID="WeldSpec" DataField="WeldSpec"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="领用时间" ColumnID="UsingDate" DataField="UsingDate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="领用数量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="发放人" ColumnID="StoreMan" DataField="StoreMan"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="35" Value="35" />
<f:ListItem Text="50" Value="50" />
<f:ListItem Text="所有行" Value="1000000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Region>
</Regions>
</f:RegionPanel>
</form>
</body>
</html>

232
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/TimeOutNoReturn.aspx.cs Normal file
View File

@ -0,0 +1,232 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Text;
namespace FineUIPro.Web.WeldMat.ReleaseRecovery
{
public partial class TimeOutNoReturn : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
this.drpProject.DataTextField = "ProjectCode";
this.drpProject.DataValueField = "ProjectId";
this.drpProject.DataSource = BLL.Base_ProjectService.GetProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProject.DataBind();
Funs.FineUIPleaseSelect(this.drpProject);
BindGrid();
}
}
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT project.ProjectCode, weld.WeldName,weld.WeldCode,weld.WeldSpec,
wtype.WeldTypeName,welder.WED_Code,welder.WED_Name,m.UsingDate, team.TeamGroupName,unit.UnitName,
users.StoreName AS StoreMan,(ISNULL(m.Amount,0)+ ISNULL(m.TwoAmount,0)) AS Amount
FROM dbo.Weld_UsingMat m
LEFT JOIN dbo.Weld_UsingPlan usingPlan ON usingPlan.UsingPlanId = m.UsingPlanId
LEFT JOIN dbo.Weld_RecycleMat r ON m.UsingMatId=r.UsingMatId
LEFT JOIN dbo.Weld_WeldInfo weld ON weld.WeldId = m.WeldId
LEFT JOIN dbo.Weld_WeldType wtype ON wtype.WeldTypeId = weld.WeldTypeId
LEFT JOIN dbo.Base_Project project ON project.ProjectId = m.ProjectId
LEFT JOIN dbo.HJGL_BS_Welder welder ON welder.WED_ID=m.UsingMan
LEFT JOIN dbo.Base_TeamGroup team ON team.TeamGroupId = usingPlan.TeamGroupId
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=usingPlan.UsingUnit
LEFT JOIN dbo.Weld_Storeman users ON users.StoremanId=m.StoreMan
WHERE m.IsWelderConfirm=1 AND m.IsStoreManConfirm=1
AND (IsClose IS NULL OR IsClose=0)
AND (CASE WHEN ((wtype.WeldTypeName='焊丝' AND DATEDIFF(MINUTE ,m.UsingDate,GETDATE())>720) OR
(wtype.WeldTypeName='焊条' AND DATEDIFF(MINUTE ,m.UsingDate,GETDATE())>240)) THEN 1
ELSE 0 END)=1";
List<SqlParameter> listStr = new List<SqlParameter>();
if (drpProject.SelectedValue != Const._Null)
{
strSql += " AND m.ProjectId = @ProjectId";
listStr.Add(new SqlParameter("@ProjectId", drpProject.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtWeldName.Text.Trim()))
{
strSql += " AND weld.WeldName LIKE @WeldName";
listStr.Add(new SqlParameter("@WeldName", "%" + this.txtWeldName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtUnitName.Text.Trim()))
{
strSql += " AND unit.UnitName LIKE @UnitName";
listStr.Add(new SqlParameter("@UnitName", "%" + this.txtUnitName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWEDCode.Text.Trim()))
{
strSql += " AND welder.WED_Code LIKE @WED_Code";
listStr.Add(new SqlParameter("@WED_Code", "%" + this.txtWEDCode.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtWEDName.Text.Trim()))
{
strSql += " AND welder.WED_Name LIKE @WED_Name";
listStr.Add(new SqlParameter("@WED_Name", "%" + this.txtWEDName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtTeamGroupName.Text.Trim()))
{
strSql += " AND team.TeamGroupName LIKE @TeamGroupName";
listStr.Add(new SqlParameter("@TeamGroupName", "%" + this.txtTeamGroupName.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtStarTime.Text))
{
strSql += " AND m.UsingDate >= @startTime";
listStr.Add(new SqlParameter("@startTime", this.txtStarTime.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
{
strSql += " AND m.UsingDate <= @endTime";
listStr.Add(new SqlParameter("@endTime", this.txtEndTime.Text.Trim()));
}
strSql += " ORDER BY project.ProjectCode,m.UsingDate";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
#endregion
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid();
}
#endregion
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
#region 统计分析
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 导出
/// 导出按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnOut_Click(object sender, EventArgs e)
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("超时未退库统计" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
Response.Write(GetGridTableHtml(Grid1));
Response.End();
}
/// <summary>
/// 导出方法
/// </summary>
/// <param name="grid"></param>
/// <returns></returns>
private string GetGridTableHtml(Grid grid)
{
StringBuilder sb = new StringBuilder();
sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
sb.Append("<tr>");
this.Grid1.PageSize = 100000;
BindGrid();
foreach (GridColumn column in grid.Columns)
{
sb.AppendFormat("<td>{0}</td>", column.HeaderText);
}
sb.Append("</tr>");
foreach (GridRow row in grid.Rows)
{
sb.Append("<tr>");
foreach (GridColumn column in grid.Columns)
{
string html = row.Values[column.ColumnIndex].ToString();
//if (column.ColumnID == "tfNumber")
//{
// html = (row.FindControl("labNumber") as AspNet.Label).Text;
//}
sb.AppendFormat("<td>{0}</td>", html);
}
sb.Append("</tr>");
}
sb.Append("</table>");
return sb.ToString();
}
#endregion
}
}

233
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/TimeOutNoReturn.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,233 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.ReleaseRecovery
{
public partial class TimeOutNoReturn
{
/// <summary>
/// Head1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// RegionPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RegionPanel RegionPanel1;
/// <summary>
/// Region1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpProject 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// txtWeldName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldName;
/// <summary>
/// txtUnitName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitName;
/// <summary>
/// txtWEDCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWEDCode;
/// <summary>
/// txtWEDName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWEDName;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtTeamGroupName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTeamGroupName;
/// <summary>
/// txtStarTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStarTime;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// BtnAnalyse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button BtnAnalyse;
/// <summary>
/// btnOut 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Region2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Region Region2;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
}
}

178
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/WeldMatStatistics.aspx
View File

@ -37,74 +37,122 @@
</f:Tree> </f:Tree>
</Items> </Items>
</f:Panel> </f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" <f:Panel ID="Panel2" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接材料发放回收统计" ShowHeader="false" Layout="Region" BoxConfigAlign="Stretch">
TitleToolTip="焊接材料发放回收统计" AutoScroll="true">
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接材料发放回收记录" EnableCollapse="true" <f:Panel runat="server" ID="panelTopRegion" RegionPosition="Center"
runat="server" BoxFlex="1" DataKeyNames="Number" AllowCellEditing="true" ClicksToEdit="2" Title="中间面板" ShowBorder="false" ShowHeader="false" Layout="VBox">
DataIDField="Number" AllowSorting="true" SortField="WeldName,WeldSpec"
OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items> <Items>
<f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件" AutoPostBack="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接材料发放回收记录" EnableCollapse="true"
OnTextChanged="TextBox_TextChanged" Width="180px" LabelAlign="right" LabelWidth="70px"> runat="server" BoxFlex="1" DataKeyNames="WeldName,WeldSpec" DataIDField="Number"
</f:TextBox> AllowSorting="true" SortField="WeldName,WeldSpec" OnSort="Grid1_Sort" AllowPaging="true"
<f:DatePicker runat="server" Label="领用日期" ID="txtStarTime" LabelAlign="right" LabelWidth="70px" Width="190px" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:DatePicker> EnableRowSelectEvent="true" OnRowSelect="Grid1_RowSelect" EnableTextSelection="True">
<f:DatePicker runat="server" Label="至" ID="txtEndTime" LabelWidth="20px" Width="140px" <Toolbars>
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:DatePicker> <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <Items>
</f:ToolbarFill> <f:TextBox runat="server" Label="焊材牌号" ID="txtWeldName" EmptyText="输入查询条件" AutoPostBack="true"
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo" OnTextChanged="TextBox_TextChanged" Width="180px" LabelAlign="right" LabelWidth="70px">
EnableAjax="false" DisableControlBeforePostBack="false" > </f:TextBox>
</f:Button> <f:DatePicker runat="server" Label="领用日期" ID="txtStarTime" LabelAlign="right" LabelWidth="70px" Width="190px"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:DatePicker>
<f:DatePicker runat="server" Label="至" ID="txtEndTime" LabelWidth="20px" Width="140px"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:DatePicker>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" Icon="TableGo"
EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="180px" ColumnID="WeldName" DataField="WeldName"
FieldType="String" HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="WeldSpec" DataField="WeldSpec"
FieldType="String" HeaderText="焊材规格" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="WeldUnit" DataField="WeldUnit" FieldType="String"
HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Amount" DataField="Amount" FieldType="Float"
HeaderText="数量" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField HeaderText="重量（kg）" ColumnID="UsingWeight" DataField="UsingWeight"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
</f:RenderField>
<f:GroupField ID="GroupField1" HeaderText="焊材回收" runat="server" HeaderTextAlign="Center" TextAlign="Center">
<Columns>
<f:RenderField Width="100px" ColumnID="MatTopAmount" DataField="MatTopAmount" FieldType="Int"
HeaderText="焊条头" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RecycleAmount" DataField="RecycleAmount" FieldType="Float"
HeaderText="焊材" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items> </Items>
</f:Toolbar> </f:Panel>
</Toolbars> <f:Panel runat="server" ID="panelBottomRegion" RegionPosition="Bottom" RegionSplit="true" RegionSplitWidth="20px" EnableCollapse="true" Height="300px"
<Columns> Title="底部面板" ShowBorder="false" ShowHeader="false" BodyPadding="1px" Layout="Fit">
<f:RenderField Width="180px" ColumnID="WeldName" DataField="WeldName" <Items>
FieldType="String" HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Left"> <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
</f:RenderField> runat="server" BoxFlex="1" DataKeyNames="Number"
<f:RenderField Width="90px" ColumnID="WeldSpec" DataField="WeldSpec" DataIDField="Number" AllowSorting="true" SortField="WeldName,WeldSpec">
FieldType="String" HeaderText="焊材规格" HeaderTextAlign="Center" TextAlign="Left"> <Columns>
</f:RenderField> <f:RenderField HeaderText="领用单位" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
<%--<f:RenderField Width="150px" ColumnID="Warrantybook" DataField="Warrantybook" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
FieldType="String" HeaderText="批号" HeaderTextAlign="Center" TextAlign="Left"> </f:RenderField>
</f:RenderField>--%> <f:RenderField HeaderText="焊工班组" ColumnID="TeamGroupName" DataField="TeamGroupName" SortField="TeamGroupName"
<f:RenderField Width="100px" ColumnID="WeldUnit" DataField="WeldUnit" FieldType="String" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center"> </f:RenderField>
</f:RenderField> <f:RenderField Width="180px" ColumnID="WeldName" DataField="WeldName"
<f:RenderField Width="100px" ColumnID="Amount" DataField="Amount" FieldType="Float" FieldType="String" HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Left">
HeaderText="数量" HeaderTextAlign="Center" TextAlign="Center"> </f:RenderField>
</f:RenderField> <f:RenderField Width="90px" ColumnID="WeldSpec" DataField="WeldSpec"
<f:GroupField ID="GroupField1" HeaderText="焊材回收" runat="server" HeaderTextAlign="Center" TextAlign="Center"> FieldType="String" HeaderText="焊材规格" HeaderTextAlign="Center" TextAlign="Left">
<Columns> </f:RenderField>
<f:RenderField Width="100px" ColumnID="MatTopAmount" DataField="MatTopAmount" FieldType="Int"
HeaderText="焊条头" HeaderTextAlign="Center" TextAlign="Center"> <f:RenderField Width="100px" ColumnID="WeldUnit" DataField="WeldUnit" FieldType="String"
</f:RenderField> HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField Width="100px" ColumnID="RecycleAmount" DataField="RecycleAmount" FieldType="Float" </f:RenderField>
HeaderText="焊材" HeaderTextAlign="Center" TextAlign="Center"> <f:RenderField Width="100px" ColumnID="Amount" DataField="Amount" FieldType="Float"
</f:RenderField> HeaderText="数量" HeaderTextAlign="Center" TextAlign="Center">
</Columns> </f:RenderField>
</f:GroupField> <f:RenderField HeaderText="重量（kg）" ColumnID="UsingWeight" DataField="UsingWeight"
</Columns> FieldType="Double" HeaderTextAlign="Center" TextAlign="Right" Width="120px">
<PageItems> </f:RenderField>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:GroupField ID="GroupField2" HeaderText="焊材回收" runat="server" HeaderTextAlign="Center" TextAlign="Center">
</f:ToolbarSeparator> <Columns>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:RenderField Width="100px" ColumnID="MatTopAmount" DataField="MatTopAmount" FieldType="Int"
</f:ToolbarText> HeaderText="焊条头" HeaderTextAlign="Center" TextAlign="Center">
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" </f:RenderField>
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> <f:RenderField Width="100px" ColumnID="RecycleAmount" DataField="RecycleAmount" FieldType="Float"
<f:ListItem Text="15" Value="15" /> HeaderText="焊材" HeaderTextAlign="Center" TextAlign="Center">
<f:ListItem Text="20" Value="20" /> </f:RenderField>
<f:ListItem Text="25" Value="25" /> </Columns>
</f:DropDownList> </f:GroupField>
</PageItems> </Columns>
</f:Grid> </f:Grid>
</Items>
</f:Panel>
</Items> </Items>
</f:Panel> </f:Panel>
</Items> </Items>

68
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/WeldMatStatistics.aspx.cs
View File

@ -77,6 +77,7 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{ {
this.BindGrid(); this.BindGrid();
Grid2.Rows.Clear();
} }
#endregion #endregion
@ -104,6 +105,8 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery
listStr.Add(new SqlParameter("@WeldName", null)); listStr.Add(new SqlParameter("@WeldName", null));
} }
listStr.Add(new SqlParameter("@WeldSpec", null));
if (!string.IsNullOrEmpty(this.txtStarTime.Text)) if (!string.IsNullOrEmpty(this.txtStarTime.Text))
{ {
listStr.Add(new SqlParameter("@StartDate", Convert.ToDateTime(this.txtStarTime.Text.Trim()))); listStr.Add(new SqlParameter("@StartDate", Convert.ToDateTime(this.txtStarTime.Text.Trim())));
@ -136,6 +139,71 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery
} }
#endregion #endregion
protected void Grid1_RowSelect(object sender, GridRowSelectEventArgs e)
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string weldName = Grid1.DataKeys[e.RowIndex][0].ToString();
string weldSpec= Grid1.DataKeys[e.RowIndex][1].ToString();
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.tvControlItem.SelectedNodeID != null && this.tvControlItem.SelectedNodeID != "0")
{
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
}
else
{
listStr.Add(new SqlParameter("@ProjectId", null));
}
if (!string.IsNullOrEmpty(weldName))
{
listStr.Add(new SqlParameter("@WeldName", "%" + weldName + "%"));
}
else
{
listStr.Add(new SqlParameter("@WeldName", null));
}
if (!string.IsNullOrEmpty(this.txtStarTime.Text))
{
listStr.Add(new SqlParameter("@StartDate", Convert.ToDateTime(this.txtStarTime.Text.Trim())));
}
else
{
listStr.Add(new SqlParameter("@StartDate", null));
}
if (!string.IsNullOrEmpty(this.txtEndTime.Text))
{
listStr.Add(new SqlParameter("@EndDate", Convert.ToDateTime(this.txtEndTime.Text.Trim())));
}
else
{
listStr.Add(new SqlParameter("@EndDate", null));
}
if (!string.IsNullOrEmpty(weldSpec))
{
listStr.Add(new SqlParameter("@WeldSpec", weldSpec));
}
else
{
listStr.Add(new SqlParameter("@WeldSpec", null));
}
listStr.Add(new SqlParameter("@IsTeamGroup", "1"));
SqlParameter[] parameter = listStr.ToArray();
DataTable dt = SQLHelper.GetDataTableRunProc("sp_Weld_ReleaseRecovery", parameter);
//Grid2.RecordCount = tb.Rows.Count;
//var table = this.GetPagedDataTable(Grid1, tb);
//this.OutputSummaryData(tb); ///取合计值
Grid2.DataSource = dt;
Grid2.DataBind();
}
}
#region 计算合计 #region 计算合计
/// <summary> /// <summary>
/// 计算合计 /// 计算合计

46
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/WeldMatStatistics.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.ReleaseRecovery { namespace FineUIPro.Web.WeldMat.ReleaseRecovery
{
public partial class WeldMatStatistics { public partial class WeldMatStatistics
{
/// <summary> /// <summary>
/// Head1 控件。 /// Head1 控件。
@ -85,13 +87,22 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery {
protected global::FineUIPro.Tree tvControlItem; protected global::FineUIPro.Tree tvControlItem;
/// <summary> /// <summary>
/// panelCenterRegion 控件。 /// Panel2 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Panel panelCenterRegion; protected global::FineUIPro.Panel Panel2;
/// <summary>
/// panelTopRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelTopRegion;
/// <summary> /// <summary>
/// Grid1 控件。 /// Grid1 控件。
@ -191,5 +202,32 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize; protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// panelBottomRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelBottomRegion;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// GroupField2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField GroupField2;
} }
} }

1
HJGL_ZH/FineUIPro.Web/WeldMat/ReleaseRecovery/WeldUseAmount.aspx.cs
View File

@ -76,6 +76,7 @@ namespace FineUIPro.Web.WeldMat.ReleaseRecovery
listStr.Add(new SqlParameter("@EndDate", null)); listStr.Add(new SqlParameter("@EndDate", null));
} }
listStr.Add(new SqlParameter("@WeldSpec", null));
listStr.Add(new SqlParameter("@IsTeamGroup", "1")); listStr.Add(new SqlParameter("@IsTeamGroup", "1"));
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();

11
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockIn.aspx.cs
View File

@ -235,7 +235,16 @@ namespace FineUIPro.Web.WeldMat.Stock
var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId); var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId);
if (s != null && s.UnitId == CurrUser.UnitId) if (s != null && s.UnitId == CurrUser.UnitId)
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInEdit.aspx?StockInId={0}", id, "编辑 - "))); if (s.IsUse == true)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInEdit.aspx?StockInId={0}", id, "编辑 - ")));
}
else
{
Alert.ShowInTop("该仓库已停用，不能修改！", MessageBoxIcon.Warning);
return;
}
} }
else else
{ {

10
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockInit.aspx.cs
View File

@ -234,7 +234,15 @@ namespace FineUIPro.Web.WeldMat.Stock
var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId); var s = BLL.UnitStoreService.GetUnitStoreById(q.UnitStoreId);
if (s != null && s.UnitId == CurrUser.UnitId) if (s != null && s.UnitId == CurrUser.UnitId)
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInitEdit.aspx?StockInId={0}", id, "编辑 - "))); if (s.IsUse == true)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StockInitEdit.aspx?StockInId={0}", id, "编辑 - ")));
}
else
{
Alert.ShowInTop("该仓库已停用，不能修改！", MessageBoxIcon.Warning);
return;
}
} }
else else
{ {

2
HJGL_ZH/FineUIPro.Web/WeldMat/Stock/StockSelectDetail.aspx.cs
View File

@ -170,7 +170,7 @@ namespace FineUIPro.Web.WeldMat.Stock
if (drpUnit.SelectedValue != Const._Null) if (drpUnit.SelectedValue != Const._Null)
{ {
drpUnitStore.Items.Clear(); drpUnitStore.Items.Clear();
BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, drpUnit.SelectedValue, true); BLL.UnitStoreService.InitUnitStoreAll(drpUnitStore, drpUnit.SelectedValue, true);
drpUnitStore.SelectedValue = Const._Null; drpUnitStore.SelectedValue = Const._Null;
} }
} }

1
HJGL_ZH/FineUIPro.Web/WeldMat/UsingSentMat/ShowStockIn.aspx.cs
View File

@ -69,6 +69,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId LEFT JOIN dbo.Weld_Supplier supplier ON supplier.SupplierId=StockIn.SupplierId
LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId LEFT JOIN dbo.Weld_UnitStore store ON store.UnitStoreId = StockIn.UnitStoreId
WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0 WHERE (StockIn.Amount-ISNULL(StockIn.UsingAmount,0)+ISNULL(StockIn.RecycleAmount,0))>0
AND store.IsUse=1
AND StockIn.WeldId=@WeldId AND store.UnitId=@UnitId"; AND StockIn.WeldId=@WeldId AND store.UnitId=@UnitId";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
if (plan != null) if (plan != null)