From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 12 八月 2024 09:18:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/AddEmployeeDlg.cs | 222 ++++++++++++++++---------------------------------------
1 files changed, 64 insertions(+), 158 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/AddEmployeeDlg.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/AddEmployeeDlg.cs
index 4a9e4ac..94c0b38 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/AddEmployeeDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/02-Employee/AddEmployeeDlg.cs
@@ -1,8 +1,4 @@
-锘縰sing DevExpress.Mvvm.Native;
-using DevExpress.Office.Utils;
-using DevExpress.XtraEditors;
-using Dm.filter.log;
-using HStation.Dto;
+锘縰sing DevExpress.XtraEditors;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -10,10 +6,8 @@
using System.Drawing;
using System.Linq;
using System.Text;
-using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-using Yw.DAL.Basic;
namespace HStation.WinFrmUI.Organize.Core._02_Employee
{
@@ -22,179 +16,91 @@
public AddEmployeeDlg()
{
InitializeComponent();
- loginUserForm.SetNoInput();
}
-
- private readonly HStation.Service.LoginUserMain _service = new();
- long _emloyeeId;
- bool AddSuccessfully;
- private async void AddEmloyeeUse()
+ //纭畾
+ private async void simpleButtonOK_Click(object sender, EventArgs e)
{
var bll = new BLL.EmployeeMain();
+ string error;
- _emloyeeId = await bll.InsertLoginUserEx(new Dto.UpdateEmployeeMainDto
+ HStation.Vmo.EmployeeMain employee =new Vmo.EmployeeMain();
+ employee = emloyeeInfoCtrl.SetBindingData(employee, out error);
+ //var a = employee.AddTime;
+ //var b =employee.LastModifyTime;
+ if (!string.IsNullOrEmpty(error))
{
- AddTime = DateTime.Now,
- ErpCode = emloyeeInfoCtrl.GetErpCode(),
- PositonName = emloyeeInfoCtrl.GetPositonName(),
- FirstName = emloyeeInfoCtrl.GetName(),
- LastName = emloyeeInfoCtrl.GetEnglishNametextEdit(),
- Telephone = emloyeeInfoCtrl.GetTelephone(),
- DrawSignal = emloyeeInfoCtrl.GetDrawSignal(),
- Email = emloyeeInfoCtrl.GetEmail(),
- StaffStatus = emloyeeInfoCtrl.GetZhuangTai(),
- RequirePasswordReset = emloyeeInfoCtrl.GetChongZhi(),
- LastModifyTime = DateTime.Now,
-
- }, new Dto.AddUserLoginMapDto
- {
- ObjectType = Service.Organize.eObjectType.Employee,
- }, new Dto.AddLoginUserMainDto { LoginName = loginUserForm.GetLoginName(), PassWord = loginUserForm.GetPassWord(), CreateTime = DateTime.Now });
- AddSuccessfully = false;
- }
- private async void AddEmloyee()
- {
- //List<Model.LoginUserMain> all = _service.GetAll();
- var bll = new BLL.EmployeeMain();
- _emloyeeId = await bll.InsertEx(new Dto.UpdateEmployeeMainDto
- {
- AddTime = DateTime.Now,
- ErpCode = emloyeeInfoCtrl.GetErpCode(),
- PositonName = emloyeeInfoCtrl.GetPositonName(),
- FirstName = emloyeeInfoCtrl.GetName(),
- LastName = emloyeeInfoCtrl.GetEnglishNametextEdit(),
- Telephone = emloyeeInfoCtrl.GetTelephone(),
- DrawSignal = emloyeeInfoCtrl.GetDrawSignal(),
- Email = emloyeeInfoCtrl.GetEmail(),
- StaffStatus = emloyeeInfoCtrl.GetZhuangTai(),
- RequirePasswordReset = emloyeeInfoCtrl.GetChongZhi(),
- LastModifyTime = DateTime.Now,
- }, new Dto.AddUserLoginMapDto
- {
-
- LoginID = 11,
- ObjectType = Service.Organize.eObjectType.Employee,
-
- });
- AddSuccessfully = false;
- }
- public long GetNewAddEmloyeeId()
- {
- return _emloyeeId;
- }
- public bool GetAddSuccessfully()
- {
- return AddSuccessfully;
- }
- // @"^[^@\s]+@[^@\s]+\.[^@\s]+$"
- private bool IsValidEmail(string email)
- {
- return Regex.IsMatch(email, @"^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$");
- }
-
- private async void QueDingsimpleButton_Click(object sender, EventArgs e)
- {
-
- emloyeeInfoCtrl.IsValid();
-
- if (!IsValidEmail(emloyeeInfoCtrl.GetEmail())&& !String.IsNullOrEmpty(emloyeeInfoCtrl.GetEmail()))
- {
- MessageBox.Show("閭鏍煎紡閿欒锛�");
+ MessageBox.Show(error);
return;
}
- if (loginUserForm.GetPassWord() != loginUserForm.GetQueRenPassWord())
- {
- MessageBox.Show("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷淬�佽閲嶆柊杈撳叆锛�");
- AddSuccessfully = false;
- return;
- }
- var bll = new BLL.EmployeeMain();
- EmployeeMainDto employeeDate = await bll.GetByErpCode(emloyeeInfoCtrl.GetErpCode());
- if (employeeDate != null && String.IsNullOrEmpty(emloyeeInfoCtrl.GetErpCode()))
+ var employeeDate = await bll.GetByErpCode(employee.ErpCode) ;
+ if (employeeDate != null && !String.IsNullOrEmpty(employee.ErpCode))
{
MessageBox.Show("缂栧彿閲嶅锛岃閲嶆柊杈撳叆锛�");
return;
}
- if (String.IsNullOrEmpty(emloyeeInfoCtrl.GetEnglishNametextEdit()))
+ var ids = await bll.InsertEx(employee);
+ var a =employee.FirstName;
+ if (ids == null)
{
- emloyeeInfoCtrl.SetEnglishNametextEdit("鏆傛棤");
- }
- if (employeeDate != null)
- {
- MessageBox.Show("缂栧彿閲嶅锛岃閲嶆柊杈撳叆锛�");
+ MessageBox.Show("娣诲姞澶辫触锛佸彲鑳芥暟鎹簱杩炴帴澶辫触锛�");
return;
}
- if (CreateLogincheckEdit.Checked == true)
- {
- loginUserForm.IsValid();
- }
-
- //String.IsNullOrEmpty(emloyeeFrom.GetChongZhiText()) || String.IsNullOrEmpty(emloyeeFrom.GetZhuangTaiText()) ||
- if (String.IsNullOrEmpty(emloyeeInfoCtrl.GetDrawSignal())||String.IsNullOrEmpty(emloyeeInfoCtrl.GetErpCode()) || String.IsNullOrEmpty(emloyeeInfoCtrl.GetPositonName()) || String.IsNullOrEmpty(emloyeeInfoCtrl.GetName()) || String.IsNullOrEmpty(emloyeeInfoCtrl.GetTelephone()) || String.IsNullOrEmpty(emloyeeInfoCtrl.GetDrawSignal()))
- {
- MessageBox.Show("鍩烘湰淇℃伅涓嶈兘閮ㄥ垎涓虹┖锛�");
- AddSuccessfully = false;
- return;
- }
-
- if (emloyeeInfoCtrl.GetTelephone().Length != 11)
- {
- MessageBox.Show("璇疯緭鍏ユ纭牸寮忕殑鐢佃瘽鍙凤紒");
- AddSuccessfully = false;
- return;
- }
- //if (emloyeeInfoCtrl.GetZhuangTai() != 0 && emloyeeInfoCtrl.GetZhuangTai() != 1)
- //{
- // MessageBox.Show("鍦ㄨ亴鐘舵�佽閫夋嫨'绂昏亴'鎴�'鍦ㄨ亴'锛�");
- // AddSuccessfully = false;
- // return;
- //}
- //if (emloyeeInfoCtrl.GetChongZhi() != 0 && emloyeeInfoCtrl.GetChongZhi() != 1)
- //{
- // MessageBox.Show("鏄惁鐧诲綍閲嶇疆璇烽�夋嫨'鏄�'鎴�'鍚�'锛�");
- // AddSuccessfully = false;
- // return;
- //}
- if (CreateLogincheckEdit.Checked == true)
- {
- if (String.IsNullOrEmpty(loginUserForm.GetLoginName()) || String.IsNullOrEmpty(loginUserForm.GetPassWord()))
- {
- MessageBox.Show("鐧诲綍鐢ㄦ埛鍚嶆垨瀵嗙爜涓嶈兘涓虹┖锛�");
- AddSuccessfully = false;
- return;
- }
- AddEmloyeeUse();
- }
- else
- {
- AddEmloyee();
- }
+ this.DialogResult = DialogResult.OK;
MessageBox.Show("娣诲姞鎴愬姛锛�");
- AddSuccessfully = true;
this.Close();
}
-
- private void QuXiaosimpleButton_Click(object sender, EventArgs e)
+ //鍙栨秷
+ private void simpleButtonCancel_Click(object sender, EventArgs e)
{
- if (e == null)
- {
- return;
- }
+ this.DialogResult = DialogResult.Cancel;
this.Close();
}
+ //private void AddEmployeeDlg_Load(object sender, EventArgs e)
+ //{
+ // emloyeeInfoCtrl.SetBindingData(null);
+ //}
- private void CreateLogincheckEdit_CheckedChanged(object sender, EventArgs e)
- {
- if (CreateLogincheckEdit.Checked == true)
- {
- loginUserForm.SetOffInput();
- }
- else
- {
- loginUserForm.SetNoInput();
- }
- }
+
+
+
+ //private async void QueDingsimpleButton_Click(object sender, EventArgs e)
+ //{
+ // string error;
+ // var employe = emloyeeInfoCtrl.GetBindingData(out error);
+ // if (employe == null)
+ // {
+ // MessageBox.Show(error);
+ // return;
+ // }
+ //
+
+ // var bll = new BLL.EmployeeMain();
+ // EmployeeMain employeeDate = await bll.GetByErpCode(emloyeeInfoCtrl.GetBindingData(out error).ErpCode);
+ // if (employeeDate != null && String.IsNullOrEmpty(emloyeeInfoCtrl.GetBindingData(out error).ErpCode))
+ // {
+ // MessageBox.Show("缂栧彿閲嶅锛岃閲嶆柊杈撳叆锛�");
+ // return;
+ // }
+
+ // var ids = await bll.InsertEx(employe);
+ // if (ids == null)
+ // {
+ // MessageBox.Show("娣诲姞澶辫触锛佸彲鑳芥暟鎹簱杩炴帴澶辫触");
+ // return;
+ // }
+
+ // MessageBox.Show("娣诲姞鎴愬姛锛�");
+ // this.DialogResult = DialogResult.OK;
+ // this.Close();
+ //}
+
+ //private void QuXiaosimpleButton_Click(object sender, EventArgs e)
+ //{
+ // this.DialogResult = DialogResult.Cancel;
+ // this.Close();
+ //}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3