Browse Source

优化

master
钱峰 13 hours ago
parent
commit
31a263f28f
  1. 8
      SCP/Views/BasicData/Appliance.aspx
  2. 11
      SCP/Views/BasicData/Appliance.aspx.cs
  3. 8
      SCP/Views/BasicData/Appliance_DETAIL.aspx.cs
  4. 2
      SCP/Views/BasicData/BoxType.aspx.cs
  5. 74
      SCP/Views/BasicData/OperateLog.aspx
  6. 64
      SCP/Views/BasicData/OperateLog.aspx.cs
  7. 107
      SCP/Views/BasicData/OperateLog.aspx.designer.cs
  8. 4
      SCP/Views/BasicData/Pinfan.aspx.cs
  9. 2
      SCP/Views/BasicData/SCP_RECRINFORMTION.aspx.cs
  10. 2
      SCP/Views/BasicData/SubPart.aspx.cs
  11. 6
      SCP/Views/BasicData/TA_VehicleModel.aspx.cs
  12. 4
      SCP/Views/PlanData/SCP_RECEIVE_DETAIL.aspx.cs
  13. 138
      SCP/default.aspx.cs

8
SCP/Views/BasicData/Appliance.aspx

@ -42,9 +42,9 @@
<f:Grid ID="Grid1" runat="server" BoxFlex="1"
ShowHeader="False" DataKeyNames=" UID,PartNumber,Texture,ReceivingPort,PartDesc1,Model,PackNumber,ReciteNumber, SufanLand,BoxType,PostEngineering,VendID,OtherVendName"
AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange"
ShowBorder="False"
AllowSorting="true" IsDatabasePaging="true" SortField="PartCode" EnableCheckBoxSelect="true">
AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange" OnSort="Grid1Sort"
ShowBorder="False" SortDirection="desc"
AllowSorting="true" IsDatabasePaging="true" SortField="UID" EnableCheckBoxSelect="true">
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
@ -62,7 +62,7 @@
</f:DropDownList>
</PageItems>
<Columns>
<f:BoundField SortField="UID" DataField="UID" ColumnID="UID" Width="100px" Hidden="true" />
<f:BoundField SortField="UID" DataField="UID" HeaderText="UID" ColumnID="UID" Width="100px" />
<f:BoundField SortField="PartNumber" DataField="PartNumber" HeaderText="零件号码" ColumnID="PartNumber" Width="100px" />
<f:BoundField SortField="Texture" DataField="Texture" HeaderText="材质" ColumnID="Texture" Width="100px" />

11
SCP/Views/BasicData/Appliance.aspx.cs

@ -39,6 +39,12 @@ namespace SCP.Views.BasicData
});
}
protected void Grid1Sort(object sender, GridSortEventArgs e)
{
BindData();
}
public void SearchInvoice(Action<IQueryable<V_TA_APPLIANCE>> p_action)
{
V_TA_APPLIANCE _entity = new V_TA_APPLIANCE();
@ -116,9 +122,10 @@ namespace SCP.Views.BasicData
{
string ID = GetSelectedDataKey(Grid1, 1);
string ID1 = GetSelectedDataKey(Grid1, 11);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE1(ID,ID1);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE1(ID,ID1,CurrentUser);
if (ret.State == ReturnStatus.Succeed)
{
Alert.Show("删除成功");
BindData();
}
@ -179,7 +186,7 @@ namespace SCP.Views.BasicData
_dt = ExcelHelper.GetDataTableOfXlsx(_stream);
}
var list = ConvertHelper.ToList<SCP_VENDER_PART_EXPORT>(ExcelHelper.RemoveEmpty(_dt)).ToList();
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD1(list, CurrentUser.FactoryList[0], CurrentUser.Name);
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD1(list, CurrentUser.FactoryList[0], CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed && ret.Result == true)
{
Alert.Show("导入成功");

8
SCP/Views/BasicData/Appliance_DETAIL.aspx.cs

@ -75,6 +75,12 @@ namespace SCP.Views.BasicData
}
protected void Btn_Save_Click(object sender, EventArgs e)
{
string op = "插入";
if (!string.IsNullOrEmpty( Request["ReciteNumber"]))
{
op = "修改";
}
TA_Appliance _entity = new TA_Appliance();
_entity.PartNumber = TXT_PART.Text;
_entity.Texture = TXT_DESC.Text;
@ -103,7 +109,7 @@ namespace SCP.Views.BasicData
}
else
{
var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE1( _entity);
var ret1 = SCP_TA_LANGUAGE_CONTROLLER.Save_TA_LANGUAGE1( _entity,op,CurrentUser);
if (ret1.State == ReturnStatus.Succeed)
{

2
SCP/Views/BasicData/BoxType.aspx.cs

@ -47,7 +47,7 @@ namespace SCP.Views.BasicData
protected void Buttondelete_Click(object sender, EventArgs e)
{
string Box = GetSelectedDataKey(Grid1, 0);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_BoxType(Box);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_BoxType(Box,CurrentUser);
if (ret.State == ReturnStatus.Succeed)
{
BindData();

74
SCP/Views/BasicData/OperateLog.aspx

@ -0,0 +1,74 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OperateLog.aspx.cs" Inherits="SCP.Views.BasicData.OperateLog" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
<title></title>
<script language="javascript" src="../js/jquery-1.4.1.min.js"></script>
<link href="/css/exaspnet.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:Button ID="Button3" runat="server" EnablePostBack="false" Text="刷新" Icon="Reload" OnClientClick="location.reload();">
</f:Button>
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" Label="操作日期" EmptyText="请选择日期" ID="DP_StartDate" />
<f:DatePicker runat="server" Required ="true" DateFormatString="yyyy-MM-dd" EmptyText="请选择日期" Label="至" ID="Date_EndDate" />
<f:Button ID="btnSearch" runat="server" Text="快速查找" OnClick="btnSearch_Click" Icon="SystemSearch">
</f:Button>
</Items>
</f:Toolbar>
<f:Grid ID="Grid1" runat="server" EnableCheckBoxSelect="false" BoxFlex="1"
ShowHeader="False"
AllowPaging="True" PageSize="50" OnPageIndexChange="Grid1_OnPageIndexChange"
ShowBorder="False" EnableTextSelection="true"
DataKeyNames="UID" AllowSorting="true" IsDatabasePaging="true" SortField="CreateTime" SortDirection="desc">
<Columns>
<f:BoundField SortField="UID" DataField="UID" HeaderText="UID" ColumnID="UID" Width="100px" Hidden="true" />
<f:BoundField SortField="MenusText" DataField="MenusText" HeaderText="菜单名称" ColumnID="MenusText" Width="150px" />
<f:BoundField SortField="CreateUser" DataField="CreateUser" HeaderText="操作者" ColumnID="CreateUser" Width="100px" />
<f:BoundField SortField="CreateTime" DataField="CreateTime" HeaderText="操作时间" ColumnID="CreateTime" Width="100px" />
<f:BoundField SortField="Operate" DataField="Operate" HeaderText="操作类型" ColumnID="Operate" Width="100px" />
<f:BoundField SortField="BoxType" DataField="BoxType" HeaderText="箱种" ColumnID="BoxType" Width="100px" />
<f:BoundField SortField="Enabled" DataField="Enabled" HeaderText="启用状态" ColumnID="Enabled" Width="100px" />
<f:BoundField SortField="PartCode" DataField="PartCode" HeaderText="零件" ColumnID="PartCode" Width="100px" />
<f:BoundField SortField="PartDesc" DataField="PartDesc" HeaderText="零件描述" ColumnID="PartDesc" Width="100px" />
<f:BoundField DataField="SubPart" HeaderText="客户零件号" ColumnID="SubPart" Width="100px" />
<f:BoundField DataField="Model" HeaderText="车型" ColumnID="Model" Width="100px" />
<f:BoundField SortField="ReceivingPort" DataField="ReceivingPort" HeaderText="收货口" ColumnID="ReceivingPort" Width="100px" />
<f:BoundField SortField="PackNumber" DataField="PackNumber" HeaderText="标包数" ColumnID="PackNumber" Width="100px" />
<f:BoundField SortField="VendID" DataField="VendID" HeaderText="供应商" ColumnID="VendID" Width="100px" />
<f:BoundField DataField="Texture" HeaderText="材质" ColumnID="Texture" Width="100px" />
<f:BoundField DataField="Barcodnt" HeaderText="条码内容" ColumnID="Barcodnt" Width="100px" />
<f:BoundField DataField="Identification" HeaderText="Code39条码" ColumnID="Identification" Width="100px" />
<f:BoundField DataField="JsonText" HeaderText="序列化后文本" ColumnID="JsonText" Width="100px"/>
</Columns>
</f:Grid>
</Items>
</f:Panel>
<script type="text/javascript">
function onReady() {
var grid1 = Ext.getCmp('<%=Grid1.ClientID%>');
var bodySize = Ext.getBody().getSize();
grid1.setHeight(bodySize.height - 27);
}
$(window).bind("load resize", function () {
onReady();
});
</script>
</form>
</body>
</html>

64
SCP/Views/BasicData/OperateLog.aspx.cs

@ -0,0 +1,64 @@
using CK.SCP.Controller;
using CK.SCP.Models.ScpEntity;
using CK.SCP.Models.ScpEntity.ExcelExportEnttity;
using CK.SCP.Utils;
using FineUI;
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace SCP.Views.BasicData
{
public partial class OperateLog : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
BindData();
}
}
public void BindData()
{
IQueryable<TA_OperateLog> q = SCPDB.TA_OperateLog;
if (DP_StartDate.SelectedDate != null)
{
q = q.Where(p => p.CreateTime > DP_StartDate.SelectedDate);
}
if (Date_EndDate.SelectedDate != null)
{
var time = Date_EndDate.SelectedDate.Value.AddDays(1);
q = q.Where(p => p.CreateTime < time);
}
// 排列和数据库分页
Grid1.RecordCount = q.Count();
q = SortAndPage<TA_OperateLog>(q, Grid1);
var _list = q.ToList();
Grid1.DataSource = _list;
Grid1.DataBind();
}
//查询
protected void Grid1_OnPageIndexChange(object sender, GridPageEventArgs e)
{
BindData();
}
protected void btnSearch_Click(object sender, EventArgs e)
{
BindData();
}
}
}

107
SCP/Views/BasicData/OperateLog.aspx.designer.cs

@ -0,0 +1,107 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为,如果
// 重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace SCP.Views.BasicData
{
public partial class OperateLog
{
/// <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::FineUI.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Panel Panel1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Toolbar Toolbar1;
/// <summary>
/// Button3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Button Button3;
/// <summary>
/// DP_StartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.DatePicker DP_StartDate;
/// <summary>
/// Date_EndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.DatePicker Date_EndDate;
/// <summary>
/// btnSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Button btnSearch;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUI.Grid Grid1;
}
}

4
SCP/Views/BasicData/Pinfan.aspx.cs

@ -47,7 +47,7 @@ namespace SCP.Views.BasicData
protected void Buttondelete_Click(object sender, EventArgs e)
{
string ID = GetSelectedDataKey(Grid1, 0);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_PinFan(ID);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_PinFan(ID,CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed)
{
BindData();
@ -127,7 +127,7 @@ namespace SCP.Views.BasicData
_dt = ExcelHelper.GetDataTableOfXlsx(_stream);
}
var list = ConvertHelper.ToList<SCP_VENDER_EXPORT>(ExcelHelper.RemoveEmpty(_dt)).ToList();
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD6(list, CurrentUser.FactoryList[0], CurrentUser.Name);
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD6(list, CurrentUser.FactoryList[0], CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed && ret.Result == true)
{
Alert.Show("导入成功");

2
SCP/Views/BasicData/SCP_RECRINFORMTION.aspx.cs

@ -91,7 +91,7 @@ namespace SCP.Views.BasicData
{
string ID = GetSelectedDataKey(Grid1, 1);
string ID1 = GetSelectedDataKey(Grid1, 12);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE1(ID, ID1);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_LANGUAGE1(ID, ID1,CurrentUser);
if (ret.State == ReturnStatus.Succeed)
{
BindData();

2
SCP/Views/BasicData/SubPart.aspx.cs

@ -132,7 +132,7 @@ namespace SCP.Views.BasicData
_dt = ExcelHelper.GetDataTableOfXlsx(_stream);
}
var list = ConvertHelper.ToList<SCP_VENDER_PART_EXPORT>(ExcelHelper.RemoveEmpty(_dt)).ToList();
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD2(list, CurrentUser.FactoryList[0], CurrentUser.Name);
var ret = SCP_PO_CONTROLLER.EXCEL_VENDER_PART_MOD2(list, CurrentUser.FactoryList[0], CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed && ret.Result == true)
{
Alert.Show("导入成功");

6
SCP/Views/BasicData/TA_VehicleModel.aspx.cs

@ -47,7 +47,7 @@ namespace SCP.Views.BasicData
protected void Buttondelete_Click(object sender, EventArgs e)
{
string Model = GetSelectedDataKey(Grid1, 0);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_Model(Model);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Del_TA_Model(Model,CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed)
{
BindData();
@ -62,7 +62,7 @@ namespace SCP.Views.BasicData
Alert.Show("请输入要新增的车型");
return;
}
var ret = SCP_TA_LANGUAGE_CONTROLLER.Add_TA_Model(txtModel.Text);
var ret = SCP_TA_LANGUAGE_CONTROLLER.Add_TA_Model(txtModel.Text,CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed)
{
Alert.Show("增加成功");
@ -114,7 +114,7 @@ namespace SCP.Views.BasicData
_dt = ExcelHelper.GetDataTableOfXlsx(_stream);
}
var list = ConvertHelper.ToList<SCP_VENDER_EXPORT>(ExcelHelper.RemoveEmpty(_dt)).ToList();
var ret = SCP_PO_CONTROLLER.EXCEL_Car_Model(list, CurrentUser.FactoryList[0], CurrentUser.Name);
var ret = SCP_PO_CONTROLLER.EXCEL_Car_Model(list, CurrentUser.FactoryList[0], CurrentUser.ChineseName);
if (ret.State == ReturnStatus.Succeed && ret.Result == true)
{
Alert.Show("导入成功");

4
SCP/Views/PlanData/SCP_RECEIVE_DETAIL.aspx.cs

@ -85,6 +85,10 @@ namespace SCP.Views.PlanData
{
_entity.PartDesc2 = TextBoxAskNo.Text;
}
if (!string.IsNullOrEmpty( TextBillNo1.Text))
{
_entity.PoBillNum = TextBillNo1.Text.Trim();
}
_entity.ReceiveTimeBegin = DP_ReceiveTimeBegin.SelectedDate;
_entity.ReceiveTimeEnd = DP_ReceiveTimeEnd.SelectedDate;
SCP_INVOICE_CONTROLLER.Get_V_TB_INVOICE_List1(_entity, (ret) =>

138
SCP/default.aspx.cs

@ -138,49 +138,83 @@ namespace SCP
}
else
{
if (!string.IsNullOrEmpty(ScpCache.Config.))
//if (!string.IsNullOrEmpty(ScpCache.Config.密码验证格式))
//{
// Regex _regex = new Regex(ScpCache.Config.密码验证格式);
// if (!_regex.IsMatch(p_password))
// {
// lab2.InnerText = "原密码";
// this.div_1.Style.Add("visibility", "visible");
// this.div_2.Style.Add("visibility", "visible");
// this.div_3.Style.Add("display", "block");
// this.div_4.Style.Add("visibility", "visible");
// this.div_5.Style.Add("visibility", "visible");
// //this.div_6.Style.Add("display", "block");
// //lab2.InnerText = "旧密码";
// if (!string.IsNullOrEmpty(this.textPassword1.Value))
// {
// if (!_regex.IsMatch(this.textPassword1.Value))
// {
// Alert.Show(GetResourceKey(ScpCache.Config.密码验证提示语));
// return;
// }
// if (string.IsNullOrEmpty(textEmail.Value) || string.IsNullOrEmpty(textName.Value) ||
// string.IsNullOrEmpty(textMobile.Value))
// {
// Alert.Show(GetResourceKey("电子邮件、电话、姓名不能为空!"));
// return;
// }
// if (this.textPassword1.Value.Trim() != textConfim.Value.Trim())
// {
// Alert.Show(GetResourceKey("新密码与确认密码不一致!"));
// return;
// }
// user.ChineseName = this.textName.Value;
// user.Email = this.textEmail.Value;
// user.CellPhone = this.textMobile.Value;
// user.Password = PasswordUtil.CreateDbPassword(this.textPassword1.Value);
// user.LastUpdatePasswordTime = DateTime.Now;
// DB.SaveChanges();
// }
// else
// {
// Alert.Show(GetResourceKey("请填写个人信息并修改密码在点击登录!!"));
// return;
// }
// //}
//}
if (p_password == "666666")
{
Regex _regex = new Regex(ScpCache.Config.);
if (!_regex.IsMatch(p_password))
this.div_1.Style.Add("visibility", "visible");
this.div_2.Style.Add("visibility", "visible");
this.div_3.Style.Add("display", "block");
this.div_4.Style.Add("visibility", "visible");
this.div_5.Style.Add("visibility", "visible");
//this.div_6.Style.Add("display", "block");
//lab2.InnerText = "旧密码";
if (!string.IsNullOrEmpty(this.textPassword1.Value))
{
lab2.InnerText = "原密码";
this.div_1.Style.Add("visibility", "visible");
this.div_2.Style.Add("visibility", "visible");
this.div_3.Style.Add("display", "block");
this.div_4.Style.Add("visibility", "visible");
this.div_5.Style.Add("visibility", "visible");
//this.div_6.Style.Add("display", "block");
//lab2.InnerText = "旧密码";
if (!string.IsNullOrEmpty(this.textPassword1.Value))
if (string.IsNullOrEmpty(textEmail.Value) || string.IsNullOrEmpty(textName.Value) ||
string.IsNullOrEmpty(textMobile.Value))
{
if (!_regex.IsMatch(this.textPassword1.Value))
{
Alert.Show(GetResourceKey(ScpCache.Config.));
return;
}
if (string.IsNullOrEmpty(textEmail.Value) || string.IsNullOrEmpty(textName.Value) ||
string.IsNullOrEmpty(textMobile.Value))
{
Alert.Show(GetResourceKey("电子邮件、电话、姓名不能为空!"));
return;
}
if (this.textPassword1.Value.Trim() != textConfim.Value.Trim())
{
Alert.Show(GetResourceKey("新密码与确认密码不一致!"));
return;
}
user.ChineseName = this.textName.Value;
user.Email = this.textEmail.Value;
user.CellPhone = this.textMobile.Value;
user.Password = PasswordUtil.CreateDbPassword(this.textPassword1.Value);
user.LastUpdatePasswordTime = DateTime.Now;
DB.SaveChanges();
Alert.Show(GetResourceKey("电子邮件、电话、姓名不能为空!"));
return;
}
else
if (this.textPassword1.Value.Trim() != textConfim.Value.Trim())
{
Alert.Show(GetResourceKey("请填写个人信息并修改密码在点击登录!!"));
Alert.Show(GetResourceKey("新密码与确认密码不一致!"));
return;
}
user.ChineseName = this.textName.Value;
user.Email = this.textEmail.Value;
user.CellPhone = this.textMobile.Value;
user.Password = PasswordUtil.CreateDbPassword(this.textPassword1.Value);
DB.SaveChanges();
}
else
{
Alert.Show(GetResourceKey("用户名或密码不能为空!"));
return;
}
}
var _factoryList = DB.Users.Where(itm => itm.Name == user.Name).FirstOrDefault().TA_FACTORY.Select(p => p.FactoryId).ToList();
@ -200,29 +234,29 @@ namespace SCP
}
else
{
if (ScpCache.Config.)
{
var result = SCP_ASK_CONTROLLER.Update_User_ErrorCount(p_userName, Convert.ToInt32(ScpCache.Config.));
if (!string.IsNullOrEmpty(result.Message))
{
Alert.Show(result.Message);
}
else
{
Alert.Show(GetResourceKey("用户名或密码错误!"));
}
}
else
{
//if (ScpCache.Config.密码验证)
//{
// var result = SCP_ASK_CONTROLLER.Update_User_ErrorCount(p_userName, Convert.ToInt32(ScpCache.Config.密码锁定次数));
// if (!string.IsNullOrEmpty(result.Message))
// {
// Alert.Show(result.Message);
// }
// else
// {
// Alert.Show(GetResourceKey("用户名或密码错误!"));
// }
//}
//else
//{
Alert.Show(GetResourceKey("用户名或密码错误!"));
}
//}
return;
}
}
else
{
Alert.Show(GetResourceKey("用户错误!"));
Alert.Show(GetResourceKey("用户名或密码错误!"));
return;
}
}

Loading…
Cancel
Save