diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index d7dd97b..1e40812 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -246,6 +246,14 @@
+
+ Form
+
+
+ FrmRole.cs
+
+
+
@@ -393,6 +401,9 @@
FrmBudget.cs
+
+ FrmRole.cs
+
FrmRecipe.cs
Designer
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.Designer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.Designer.cs
new file mode 100644
index 0000000..bd1bf65
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.Designer.cs
@@ -0,0 +1,103 @@
+namespace Mesnac.Action.ChemicalWeighing.RoleManage
+{
+ partial class FrmRole
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.uNameTB = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // uNameTB
+ //
+ this.uNameTB.Location = new System.Drawing.Point(271, 61);
+ this.uNameTB.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.uNameTB.Name = "uNameTB";
+ this.uNameTB.Size = new System.Drawing.Size(246, 35);
+ this.uNameTB.TabIndex = 16;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.Location = new System.Drawing.Point(137, 66);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(316, 58);
+ this.label1.TabIndex = 15;
+ this.label1.Text = "角色名称:";
+ //
+ // btnOK
+ //
+ this.btnOK.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnOK.Location = new System.Drawing.Point(142, 212);
+ this.btnOK.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(130, 62);
+ this.btnOK.TabIndex = 17;
+ this.btnOK.Text = "确定(&O)";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // btnCancel
+ //
+ this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnCancel.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnCancel.Location = new System.Drawing.Point(437, 212);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(128, 62);
+ this.btnCancel.TabIndex = 18;
+ this.btnCancel.Text = "取消(&C)";
+ this.btnCancel.UseVisualStyleBackColor = true;
+ //
+ // FrmRole
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Controls.Add(this.btnOK);
+ this.Controls.Add(this.btnCancel);
+ this.Controls.Add(this.uNameTB);
+ this.Controls.Add(this.label1);
+ this.Name = "FrmRole";
+ this.Text = "FrmRole";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TextBox uNameTB;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnCancel;
+ }
+}
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.cs
new file mode 100644
index 0000000..a8f3900
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Mesnac.Action.ChemicalWeighing.RoleManage
+{
+ public partial class FrmRole : Form
+ {
+ public FrmRole()
+ {
+ InitializeComponent();
+ }
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.resx b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/FrmRole.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/RoleHelper.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/RoleHelper.cs
new file mode 100644
index 0000000..7715e8e
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/RoleHelper.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.RoleManage
+{
+ ///
+ /// 角色信息
+ ///
+ public class RoleHelper
+ {
+ }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/initRoleFormAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/initRoleFormAction.cs
new file mode 100644
index 0000000..b24dfd7
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/RoleManage/initRoleFormAction.cs
@@ -0,0 +1,22 @@
+using Mesnac.Action.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.RoleManage
+{
+ public class initRoleFormAction : ChemicalWeighingAction, IAction
+ {
+ ///
+ /// 刷新角色信息事件
+ ///
+ public static event EventHandler OnRefreshRole;
+
+ public void Run(RuntimeParameter runtime)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/Main/MCEdit/Data/EventConfig/小料称量/系统基础.系统初始化.xml b/Main/MCEdit/Data/EventConfig/小料称量/系统基础.系统初始化.xml
index 347d934..1c26091 100644
--- a/Main/MCEdit/Data/EventConfig/小料称量/系统基础.系统初始化.xml
+++ b/Main/MCEdit/Data/EventConfig/小料称量/系统基础.系统初始化.xml
@@ -2,10 +2,10 @@
-
+
系统初始化
系统数据初始化
@@ -14,10 +14,10 @@
-
- -->
+
@@ -25,9 +25,9 @@
-
+
diff --git a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
index 240325b..073f7e6 100644
--- a/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
+++ b/Main/MCEdit/Data/MCProject/SCWSProject2.mprj
@@ -14,8 +14,8 @@
-
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/BaseUser.xml b/Main/MCEdit/Data/MCProject/nodeForm/BaseUser.xml
new file mode 100644
index 0000000..5080f35
--- /dev/null
+++ b/Main/MCEdit/Data/MCProject/nodeForm/BaseUser.xml
@@ -0,0 +1,218 @@
+
+
diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FrmShift.xml b/Main/MCEdit/Data/MCProject/nodeForm/FrmShift.xml
index 5527dc3..7d856d5 100644
--- a/Main/MCEdit/Data/MCProject/nodeForm/FrmShift.xml
+++ b/Main/MCEdit/Data/MCProject/nodeForm/FrmShift.xml
@@ -241,13 +241,13 @@
Fill
0, 0
GroupBox1
- 1006, 591
+ 563, 364
12
Fill
0, 59
Panel2
- 1006, 591
+ 563, 364
@@ -301,7 +301,7 @@
Top
0, 0
Panel1
- 1006, 59
+ 563, 59
AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAEAAAAEAAAABwMAAAAAAQAAAAQAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAJBAAAAA0DBQQAAAAhTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uAwAAABU8R1VJRD5rX19CYWNraW5nRmllbGQVPE5hbWU+a19fQmFja2luZ0ZpZWxkFzxSZW1hcms+a19fQmFja2luZ0ZpZWxkAQEBAgAAAAYFAAAAIDM2NDMxNDgzODkzRTQ2NDdCQUJCRTYwOEJDNjJDMzVFBgYAAAAP5Yid5aeL5YyW54+t5qyhBgcAAAAP5Yid5aeL5YyW54+t5qyhCw==
@@ -319,7 +319,7 @@
False
False
Control
- 1022, 689
+ 579, 462
WindowsDefaultLocation
班次管理
Normal