Browse Source

添加版本号

master
lvzb 4 years ago
parent
commit
5137ac7a7a
  1. 15
      SCP/Default.aspx.designer.cs
  2. 4
      SCP/Properties/AssemblyInfo.cs
  3. 1
      SCP/SCP.csproj
  4. 10
      SCP/VersionUpdateInfo.txt
  5. 2
      SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
  6. 5
      SCP/default.aspx
  7. 2
      SCP/default.aspx.cs

15
SCP/Default.aspx.designer.cs

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP {
namespace SCP
{
public partial class _default {
public partial class _default
{
/// <summary>
/// form1 控件。
@ -309,6 +311,15 @@ namespace SCP {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlAnchor p_title3;
/// <summary>
/// Versiontxt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText Versiontxt;
/// <summary>
/// PageManager1 控件。
/// </summary>

4
SCP/Properties/AssemblyInfo.cs

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// 可以指定所有值,也可以使用“修订号”和“内部版本号”的默认值,
// 方法是按如下所示使用 "*":
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.21.0128.1")]
[assembly: AssemblyFileVersion("1.21.0128.1")]

1
SCP/SCP.csproj

@ -243,6 +243,7 @@
<Content Include="Scripts\ECharts\chart\wordCloud.js" />
<Content Include="Scripts\ECharts\echarts-all.js" />
<Content Include="Scripts\ECharts\echarts.js" />
<Content Include="VersionUpdateInfo.txt" />
<Content Include="Views\BasicData\Price.aspx" />
<Content Include="Views\BasicData\SCP_INFO.aspx" />
<Content Include="Views\BasicData\SCP_INFO_EDIT.aspx" />

10
SCP/VersionUpdateInfo.txt

@ -0,0 +1,10 @@

////////////
Version: 1.21.0128.1
Info: TB_INVOICE 添加 SubSite
V_TB_RECEIVE_LIST 添加 SubSite
TB_INVOIC 添加 SubSite和Site
登陆界面添加版本号
////////////

2
SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs

@ -318,7 +318,7 @@ namespace SCP.Views.锦州锦恒.SupplierData
_invoice.BlancePrice = 0;
}
if (_invoice.State == (int)InvoiceState.CheckSuccess)
if (_invoice.State == (int)InvoiceState.CheckSuccess|| _invoice.State == (int)InvoiceState.FinanceFail)
{
if (dpUpdateTime.SelectedDate == null)

5
SCP/default.aspx

@ -89,10 +89,13 @@
<div class="air-balloon ab-2 png"></div>
<div class="footer">
<input type="text" runat="server" id="factoryValue" >
<div style="text-align:center;margin:60px 0; font:normal 14px/24px 'MicroSoft YaHei';">
<div style="text-align:center;margin:30px 0; font:normal 14px/24px 'MicroSoft YaHei';">
<p id="p_content" runat="server"><%= GetResourceKey("适用浏览器:360、FireFox、搜狗、谷歌等. 不支持IE10及以下浏览器") %>。&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</p>
<p id="p_title4" runat="server"><%= GetResourceKey("视频下载:") %></p><a href="https://pan.baidu.com/s/1K-cxvSyd8q7VoFdNOIoolA" target="_blank" title="①供应商操作视频下载" runat="server" id="p_title1">①<%= GetResourceKey("供应商操作视频下载") %></a> &nbsp&nbsp&nbsp<a href="https://pan.baidu.com/s/1l3di_gqLlx2TDwiUK6O5iw" target="_blank" title="②物料计划员视频下载" id="p_title2" runat="server">②<%= GetResourceKey("物料计划员视频下载") %></a>&nbsp&nbsp&nbsp<a href="https://get.adobe.com/reader/?loc=cn" target="_blank" title="③供应商请先安装报表插件下载" id="p_title3" runat="server">③<%= GetResourceKey("供应商请先安装报表插件下载") %></a>
</div>
<div style="text-align:center; font:normal 14px/24px 'MicroSoft YaHei';">
<input type="text" runat="server" id="Versiontxt" style="BACKGROUND-COLOR: transparent;" readonly="readonly">
</div>
</div>
</div>

2
SCP/default.aspx.cs

@ -15,6 +15,7 @@ using CK.SCP.Utils;
using CK.SCP.Common;
using System.Configuration;
using SCP.Code;
using System.Reflection;
namespace SCP
{
@ -89,6 +90,7 @@ namespace SCP
string _content = "闻荫科技有限公司";
TA_CONFIG _cf = SCPDB.TA_CONFIG.FirstOrDefault(p => p.ParamName == ("工厂名称"));
Versiontxt.Value = "版本号:" + Assembly.GetExecutingAssembly().GetName().Version.ToString();
if (_cf != null)
{
_content = _cf.ParamValue;

Loading…
Cancel
Save