xiachangming 2 лет назад
Родитель
Сommit
03797ce6fc

+ 22 - 10
DK.Client/SystemModule/F_MST_0201.Designer.cs

@@ -64,7 +64,6 @@
             this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
             this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
             this.lblOrganization = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
             this.chkLNo = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.chkLYes = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
@@ -72,7 +71,9 @@
             this.chkVYes = new Dongke.IBOSS.PRD.Basics.BaseControls.C_CheckBox();
             this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.dgvUser = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
             this.UserCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.AD_USER_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.UserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrganizationName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OrganizationFullName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -411,15 +412,6 @@
             this.lblOrganization.TabIndex = 25;
             this.lblOrganization.Text = "所属组织";
             // 
-            // scbOrganization
-            // 
-            this.scbOrganization.CheckedData = null;
-            this.scbOrganization.IsOnlyDisplayEnd = false;
-            this.scbOrganization.Location = new System.Drawing.Point(238, 47);
-            this.scbOrganization.Name = "scbOrganization";
-            this.scbOrganization.Size = new System.Drawing.Size(378, 21);
-            this.scbOrganization.TabIndex = 24;
-            // 
             // chkLNo
             // 
             this.chkLNo.AutoSize = true;
@@ -527,6 +519,7 @@
             this.dgvUser.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dgvUser.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.UserCode,
+            this.AD_USER_CODE,
             this.UserName,
             this.OrganizationName,
             this.OrganizationFullName,
@@ -553,6 +546,7 @@
             this.dgvUser.EnableHeadersVisualStyles = false;
             this.dgvUser.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvUser.FormatQuantityColumns = null;
+            this.dgvUser.HasNode = false;
             this.dgvUser.HorizontalMergeColumn = null;
             this.dgvUser.IsAutoCountSum = true;
             this.dgvUser.IsAutoResizeColumns = false;
@@ -583,9 +577,19 @@
             this.dgvUser.Tag = true;
             this.dgvUser.TotalSumColumns = null;
             this.dgvUser.ViewRowFilter = "";
+            this.dgvUser.VirtualNodes = false;
             this.dgvUser.CellMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvUser_CellMouseClick);
             this.dgvUser.SelectionChanged += new System.EventHandler(this.dgvUser_SelectionChanged);
             // 
+            // scbOrganization
+            // 
+            this.scbOrganization.CheckedData = null;
+            this.scbOrganization.IsOnlyDisplayEnd = false;
+            this.scbOrganization.Location = new System.Drawing.Point(238, 47);
+            this.scbOrganization.Name = "scbOrganization";
+            this.scbOrganization.Size = new System.Drawing.Size(378, 21);
+            this.scbOrganization.TabIndex = 24;
+            // 
             // UserCode
             // 
             this.UserCode.DataPropertyName = "UserCode";
@@ -598,6 +602,13 @@
             this.UserCode.ReadOnly = true;
             this.UserCode.Width = 80;
             // 
+            // AD_USER_CODE
+            // 
+            this.AD_USER_CODE.DataPropertyName = "AD_USER_CODE";
+            this.AD_USER_CODE.HeaderText = "AD域";
+            this.AD_USER_CODE.Name = "AD_USER_CODE";
+            this.AD_USER_CODE.ReadOnly = true;
+            // 
             // UserName
             // 
             this.UserName.DataPropertyName = "UserName";
@@ -854,6 +865,7 @@
 		private Controls.SearchBox.ScbOrganization scbOrganization;
 		private Basics.BaseControls.C_Label lblOrganization;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn AD_USER_CODE;
         private System.Windows.Forms.DataGridViewTextBoxColumn UserName;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationName;
         private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationFullName;

+ 3 - 0
DK.Client/SystemModule/F_MST_0201.resx

@@ -194,6 +194,9 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="AD_USER_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="PostName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 34 - 1
DK.Client/SystemModule/F_MST_0202.Designer.cs

@@ -68,6 +68,8 @@
             this.scbOrganization = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbOrganization();
             this.cobPLC = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ComboBox();
             this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+            this.txtADUserCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
             ((System.ComponentModel.ISupportInitialize)(this.dgvDataJobs)).BeginInit();
             this.SuspendLayout();
             // 
@@ -208,7 +210,7 @@
             // 
             this.chkValueFlag.AutoSize = true;
             this.chkValueFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkValueFlag.Location = new System.Drawing.Point(472, 350);
+            this.chkValueFlag.Location = new System.Drawing.Point(282, 372);
             this.chkValueFlag.Name = "chkValueFlag";
             this.chkValueFlag.Size = new System.Drawing.Size(48, 16);
             this.chkValueFlag.TabIndex = 22;
@@ -288,6 +290,7 @@
             this.dgvDataJobs.EnableHeadersVisualStyles = false;
             this.dgvDataJobs.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvDataJobs.FormatQuantityColumns = null;
+            this.dgvDataJobs.HasNode = false;
             this.dgvDataJobs.HorizontalMergeColumn = null;
             this.dgvDataJobs.IsAutoCountSum = true;
             this.dgvDataJobs.IsAutoResizeColumns = false;
@@ -314,6 +317,7 @@
             this.dgvDataJobs.Tag = true;
             this.dgvDataJobs.TotalSumColumns = null;
             this.dgvDataJobs.ViewRowFilter = "";
+            this.dgvDataJobs.VirtualNodes = false;
             this.dgvDataJobs.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgvDataJobs_CellBeginEdit);
             this.dgvDataJobs.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDataJobs_CellValueChanged);
             // 
@@ -556,12 +560,37 @@
             this.c_Label3.Text = "PLC参数";
             this.c_Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // c_Label4
+            // 
+            this.c_Label4.AutoSize = true;
+            this.c_Label4.BackColor = System.Drawing.Color.Transparent;
+            this.c_Label4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.c_Label4.Location = new System.Drawing.Point(364, 351);
+            this.c_Label4.Name = "c_Label4";
+            this.c_Label4.Size = new System.Drawing.Size(29, 12);
+            this.c_Label4.TabIndex = 31;
+            this.c_Label4.Text = "AD域";
+            // 
+            // txtADUserCode
+            // 
+            this.txtADUserCode.BackColor = System.Drawing.SystemColors.Window;
+            this.txtADUserCode.BackgroundColor = System.Drawing.SystemColors.Window;
+            this.txtADUserCode.ErrorMessage = "";
+            this.txtADUserCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtADUserCode.Location = new System.Drawing.Point(396, 348);
+            this.txtADUserCode.Name = "txtADUserCode";
+            this.txtADUserCode.Size = new System.Drawing.Size(100, 21);
+            this.txtADUserCode.TabIndex = 32;
+            this.txtADUserCode.TextValue = "";
+            // 
             // F_MST_0202
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
             this.ClientSize = new System.Drawing.Size(717, 427);
+            this.Controls.Add(this.txtADUserCode);
+            this.Controls.Add(this.c_Label4);
             this.Controls.Add(this.cobPLC);
             this.Controls.Add(this.lblOrganization);
             this.Controls.Add(this.scbOrganization);
@@ -634,6 +663,8 @@
             this.Controls.SetChildIndex(this.scbOrganization, 0);
             this.Controls.SetChildIndex(this.lblOrganization, 0);
             this.Controls.SetChildIndex(this.cobPLC, 0);
+            this.Controls.SetChildIndex(this.c_Label4, 0);
+            this.Controls.SetChildIndex(this.txtADUserCode, 0);
             ((System.ComponentModel.ISupportInitialize)(this.dgvDataJobs)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -678,5 +709,7 @@
 		private Controls.SearchBox.ScbOrganization scbOrganization;
         private Basics.BaseControls.C_ComboBox cobPLC;
         private Basics.BaseControls.C_Label c_Label3;
+        private Basics.BaseControls.C_Label c_Label4;
+        private Basics.BaseControls.C_TextBox txtADUserCode;
     }
 }

+ 13 - 0
DK.Client/SystemModule/F_MST_0202.cs

@@ -243,6 +243,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 						MessageBox.Show(string.Format(Messages.MSG_CMN_W007, "\r\n系统活动的用户数已经超过授权数,不允许创建用户"),
 							this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
 					}
+					else if (returnUserID ==  Constant.INT_IS_NEGATIE_SIX)
+                    {
+						MessageBox.Show(string.Format(Messages.MSG_CMN_W007, "\r\nAD域已存在,不允许创建用户"),
+							this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
 					else
 					{
 						// 提示信息
@@ -294,6 +299,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 						MessageBox.Show(string.Format(Messages.MSG_CMN_W007, "\r\n在审批流程节点中存在的用户不能停用"),
 							 this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
 					}
+					else if (returnUserID == -Constant.INT_IS_EIGHT)
+					{
+						MessageBox.Show(string.Format(Messages.MSG_CMN_W007, "\r\nAD域已存在,不允许创建用户"),
+							this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+					}
 					else
 					{
 						// 提示信息
@@ -380,6 +390,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 							this.txtUserCode.Enabled = false;
 							this.txtUserName.Text = userData["UserName"].ToString();
 						}
+						this.txtADUserCode.Text = userData["AD_USER_CODE"].ToString();
 						this.txtMAC.Text = userData["LIMITMAC"].ToString();
 						this.txtRemarks.Text = userData["Remarks"].ToString();
 						this.chkValueFlag.Checked = userData["ValueFlag"].ToString() == "1" ? true : false;
@@ -617,6 +628,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			}
 		}
 
+
 		/// <summary>
 		/// 绑定下拉数据源
 		/// </summary>
@@ -683,6 +695,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private SUserEntity SetUserEntity()
 		{
 			SUserEntity userEntity = new SUserEntity();
+			userEntity.AD_USER_CODE = this.txtADUserCode.Text.Trim();
 			userEntity.UserCode = this.txtUserCode.Text.Trim();
 			userEntity.UserName = this.txtUserName.Text.Trim();
 			userEntity.OrganizationID = scbOrganization.SearchedPKMember;

+ 203 - 158
DK.Service/SystemModuleLogic/SystemModuleDAL.cs

@@ -1059,9 +1059,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     if (dataRow.RowState == DataRowState.Added)
                     {
                         #region 新增产品缺陷信息
-                        
+
                         #region 向TP_MST_Defect插入数据
-                        
+
                         string sqlInsertString = "INSERT INTO TP_MST_Defect"
                                                 + "(DefectCode"
                                                 + ",DefectName"
@@ -1561,7 +1561,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 foreach (DataRow dataRow in dataDefectPositionData.Rows)
                 {
                     //如果简称为空 默认为位置名称
-                    if(string.IsNullOrEmpty(dataRow["S_NAME"] +""))
+                    if (string.IsNullOrEmpty(dataRow["S_NAME"] + ""))
                     {
                         dataRow["S_NAME"] = dataRow["DefectPositionName"];
                     }
@@ -2080,89 +2080,89 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             }
         }
 
-		/// <summary>
-		/// 保存窑炉财年
-		/// </summary>
-		/// <param name="sUserInfo"></param>
-		/// <param name="skDate"></param>
-		/// <returns></returns>
-		public static ServiceResultEntity SaveKilnData(SUserInfo sUserInfo, int skDate)
-		{
-			IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
-			ServiceResultEntity sre = new ServiceResultEntity();
-			try
-			{
-				// 检验参数的有效性
-				if (skDate <= 0)
-				{
-					sre.OtherStatus = Constant.INT_IS_NEGATIE_ONE;
-					sre.Message = "财年数必须大于0";
-					return sre;
-				}
-				string sqlString = string.Empty;
-				oracleTrConn.Connect();
-
-				sqlString = "SELECT k.sk_date\n" +
-							"  FROM tp_mst_kiln k\n" +
-							" WHERE k.valueflag = '1'\n" +
-							"   AND k.accountid = :accountid\n" +
-							"   AND rownum = 1";
-
-				OracleParameter[] oracleParameter = new OracleParameter[]
-				{
-					new OracleParameter(":accountid", sUserInfo.AccountID)
-				};
-
-				string nowSKDate = oracleTrConn.GetSqlResultToStr(sqlString, oracleParameter);
-				int skDateInt = 0;
-				int.TryParse(nowSKDate, out skDateInt);
-
-				if (skDate <= skDateInt)
-				{
-					sre.OtherStatus = Constant.INT_IS_NEGATIE_ONE;
-					sre.Message = "输入值小于或等于当前系统的财年数";
-					return sre;
-				}
-
-				sqlString = "UPDATE tp_mst_kiln k\n" +
-							"   SET k.sk_batchno = 1\n" +
-							"      ,k.sk_date    = :skdate\n" +
-							"      ,k.updateuserid    = :userid\n" +
-							" WHERE k.accountid = :accountid";
-
-				oracleParameter = new OracleParameter[]
-				{
-					new OracleParameter(":skdate", skDate),
-					new OracleParameter(":userid", sUserInfo.UserID),
-					new OracleParameter(":accountid", sUserInfo.AccountID)
-				};
-				sre.OtherStatus += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
-
-				oracleTrConn.Commit();
-				oracleTrConn.Disconnect();
-				return sre;
-			}
-			catch (Exception ex)
-			{
-				if (oracleTrConn.ConnState == ConnectionState.Open)
-				{
-					oracleTrConn.Rollback();
-					oracleTrConn.Disconnect();
-				}
-				throw ex;
-			}
-		}
-		#endregion
-
-		#region 用户处理相关逻辑
-
-		/// <summary>
-		/// 新增组织机构OrganizationCode
-		/// </summary>
-		/// <param name="v_parentOrganizationCode">上级组织机构编码</param>
-		/// <param name="sUserInfo">用户基本信息</param>
-		/// <returns>int</returns>
-		public static string GetOrganizationCode(string v_parentOrganizationCode, SUserInfo sUserInfo)
+        /// <summary>
+        /// 保存窑炉财年
+        /// </summary>
+        /// <param name="sUserInfo"></param>
+        /// <param name="skDate"></param>
+        /// <returns></returns>
+        public static ServiceResultEntity SaveKilnData(SUserInfo sUserInfo, int skDate)
+        {
+            IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+            ServiceResultEntity sre = new ServiceResultEntity();
+            try
+            {
+                // 检验参数的有效性
+                if (skDate <= 0)
+                {
+                    sre.OtherStatus = Constant.INT_IS_NEGATIE_ONE;
+                    sre.Message = "财年数必须大于0";
+                    return sre;
+                }
+                string sqlString = string.Empty;
+                oracleTrConn.Connect();
+
+                sqlString = "SELECT k.sk_date\n" +
+                            "  FROM tp_mst_kiln k\n" +
+                            " WHERE k.valueflag = '1'\n" +
+                            "   AND k.accountid = :accountid\n" +
+                            "   AND rownum = 1";
+
+                OracleParameter[] oracleParameter = new OracleParameter[]
+                {
+                    new OracleParameter(":accountid", sUserInfo.AccountID)
+                };
+
+                string nowSKDate = oracleTrConn.GetSqlResultToStr(sqlString, oracleParameter);
+                int skDateInt = 0;
+                int.TryParse(nowSKDate, out skDateInt);
+
+                if (skDate <= skDateInt)
+                {
+                    sre.OtherStatus = Constant.INT_IS_NEGATIE_ONE;
+                    sre.Message = "输入值小于或等于当前系统的财年数";
+                    return sre;
+                }
+
+                sqlString = "UPDATE tp_mst_kiln k\n" +
+                            "   SET k.sk_batchno = 1\n" +
+                            "      ,k.sk_date    = :skdate\n" +
+                            "      ,k.updateuserid    = :userid\n" +
+                            " WHERE k.accountid = :accountid";
+
+                oracleParameter = new OracleParameter[]
+                {
+                    new OracleParameter(":skdate", skDate),
+                    new OracleParameter(":userid", sUserInfo.UserID),
+                    new OracleParameter(":accountid", sUserInfo.AccountID)
+                };
+                sre.OtherStatus += oracleTrConn.ExecuteNonQuery(sqlString, oracleParameter);
+
+                oracleTrConn.Commit();
+                oracleTrConn.Disconnect();
+                return sre;
+            }
+            catch (Exception ex)
+            {
+                if (oracleTrConn.ConnState == ConnectionState.Open)
+                {
+                    oracleTrConn.Rollback();
+                    oracleTrConn.Disconnect();
+                }
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 用户处理相关逻辑
+
+        /// <summary>
+        /// 新增组织机构OrganizationCode
+        /// </summary>
+        /// <param name="v_parentOrganizationCode">上级组织机构编码</param>
+        /// <param name="sUserInfo">用户基本信息</param>
+        /// <returns>int</returns>
+        public static string GetOrganizationCode(string v_parentOrganizationCode, SUserInfo sUserInfo)
         {
             IDBConnection oracleConn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
             try
@@ -2575,6 +2575,25 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 {
                     return -1;
                 }
+                //校验ad域是否已存在
+                sqlString = "SELECT 1\n" +
+               "  FROM tp_mst_user\n" +
+               " WHERE accountid = :accountid\n" +
+               "   AND valueflag = 1\n" +
+               "   AND ad_user_code = :ad_user_code";
+                parmeters2 = new OracleParameter[]
+                            {
+                                new OracleParameter(":accountid",sUserInfo.AccountID),
+                                new OracleParameter(":ad_user_code",userInfo.AD_USER_CODE),
+                            };
+                DataTable returnDT = oracleTrConn.GetSqlResultToDt(sqlString, parmeters2);
+                if(returnDT.Rows.Count>0)
+                {
+                    oracleTrConn.Commit();
+                    oracleTrConn.Disconnect();
+                    return -6;
+                }
+
                 string userTempID = oracleTrConn.GetSqlResultToStr("Select seq_mst_user_userid.nextval from dual");
                 int affectRows = 0;
                 string useridplus = Encryption.GetMD5String(userInfo.UserCode);
@@ -2607,6 +2626,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + ",BarcodePrinterID"
                                    + ",PLCID"
                                    + ",USERIDPLUS"
+                                   + ",AD_USER_CODE"
                                    + ")"
                            + " VALUES( "
                                    + ":userID"
@@ -2636,6 +2656,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + ",:BarcodePrinterID"
                                    + ",:PLCID"
                                    + ",:USERIDPLUS"
+                                   + ",:AD_USER_CODE"
                                     + ")";
                 OracleParameter[] parmeters4 = new OracleParameter[]
                         {
@@ -2663,7 +2684,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             new OracleParameter(":canloginmbc",userInfo.CanLoginMBC),
                             new OracleParameter(":BarcodePrinterID",userInfo.BarcodePrinterID),
                             new OracleParameter(":PLCID",userInfo.PLCID),
-                            new OracleParameter(":USERIDPLUS",useridplus)
+                            new OracleParameter(":USERIDPLUS",useridplus),
+                            new OracleParameter(":AD_USER_CODE",userInfo.AD_USER_CODE)
                         };
                 affectRows = oracleTrConn.ExecuteNonQuery(sqlString4, parmeters4);
                 //添加工号工种关联----庄天威 2014.10.23
@@ -2930,6 +2952,27 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     oracleTrConn.Disconnect();
                     return -1;
                 }
+                //校验ad域是否已存在
+                sqlString = "SELECT 1\n" +
+               "  FROM tp_mst_user\n" +
+               " WHERE accountid = :accountid\n" +
+                "   AND valueflag = 1\n" +
+               "   AND UserID <>:UserID\n" +
+               "   AND ad_user_code = :ad_user_code";
+                parmeters2 = new OracleParameter[]
+                            {
+                                new OracleParameter(":accountid",sUserInfo.AccountID),
+                                new OracleParameter(":ad_user_code",userInfo.AD_USER_CODE),
+                                new OracleParameter(":UserID",userInfo.UserID),
+                            };
+                DataTable returnDT = oracleTrConn.GetSqlResultToDt(sqlString, parmeters2);
+                if (returnDT.Rows.Count > 0)
+                {
+                    oracleTrConn.Commit();
+                    oracleTrConn.Disconnect();
+                    return -8;
+                }
+
                 int affectRows = 0;
                 string inString = "update TP_MST_User set "
                                          + " UserCode=:UserCode"
@@ -2953,6 +2996,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                          + ",canloginmbc=:canloginmbc"
                                          + ",BarcodePrinterID=:BarcodePrinterID"
                                          + ",PLCID=:PLCID"
+                                         + ",AD_USER_CODE = :AD_USER_CODE"
                                          + ",UpdateUserID=:UpdateUserID where UserID=" + userInfo.UserID;
                 OracleParameter[] parmeters10 = new OracleParameter[]
                 {
@@ -2977,6 +3021,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     new OracleParameter(":canloginmbc",userInfo.CanLoginMBC),
                     new OracleParameter(":BarcodePrinterID",userInfo.BarcodePrinterID),
                     new OracleParameter(":PLCID",userInfo.PLCID),
+                    new OracleParameter(":AD_USER_CODE",userInfo.AD_USER_CODE),
                 };
                 affectRows = oracleTrConn.ExecuteNonQuery(inString, parmeters10);
                 //编辑工号关联工种----庄天威 2014.10.24
@@ -3039,7 +3084,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
             {
                 #region 对应要执行的SQL语句
                 string sqlString = "update tp_mst_userlogin set locktime=null,islocked=0 where userid=:userid";
-                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                 {
                     new Oracle.ManagedDataAccess.Client.OracleParameter(":userid", OracleDbType.Int32, UserID, ParameterDirection.Input)
                 };
@@ -3084,7 +3129,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 string sql = "DELETE TP_MST_UserPurview WHERE UserID = :userID"
                            + " AND (PurviewType <>:PurviewType "
                            + " OR (PurviewType =:PurviewType AND PurviewID IN (SELECT OrganizationID FROM TP_MST_Organization WHERE ValueFlag = 1))) ";
-                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                Oracle.ManagedDataAccess.Client.OracleParameter[] paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                 {
                     new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewType",2),
                     new Oracle.ManagedDataAccess.Client.OracleParameter(":userID",userID)
@@ -3102,7 +3147,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             if (Convert.ToInt32(dataRow["PurviewID"]) == -1)
                             {
                                 sql = "select 1 from TP_MST_UserPurview where UserID=:UserID and PurviewID=:PurviewID and PurviewType=:PurviewType";
-                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                                {
                                    new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
                                    new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
@@ -3121,7 +3166,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewID"
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
-                                    paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                                    paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                            {
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
@@ -3145,7 +3190,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewID"
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
-                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                                paras = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                            {
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",userID),
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
@@ -3234,7 +3279,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                             {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
@@ -3369,7 +3414,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                             {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, userID, ParameterDirection.Input),
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
@@ -3678,7 +3723,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + ",ValueFlag"
                                     + ",CreateUserID"
                                     + ",UpdateUserID"
-                            //+ ",Relatedobjecttype"
+                                    //+ ",Relatedobjecttype"
                                     + ",CanSmartLogin"
                                     + ",CanPCLogin"
                                     + ",IsWorker)"
@@ -3693,11 +3738,11 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + ",:valueFlag"
                                     + ",:createUserID"
                                     + ",:updateUserID"
-                            //+ ",:relatedobjecttype"
+                                    //+ ",:relatedobjecttype"
                                     + ",'0'"
                                     + ",'1'"
                                     + ",'0'"
-                            //+ " FROM TP_MST_Account WHERE AccountID=:accountID";
+                                    //+ " FROM TP_MST_Account WHERE AccountID=:accountID";
                                     + ")";
                         OracleParameter[] parmeters4 = new OracleParameter[]
                         {
@@ -3734,7 +3779,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + "SETTINGCODE"
                                     + ",SETTINGNAME"
                                     + ",CATEGORYNAME"
-                            //+ ",SETTINGVALUE"
+                                    //+ ",SETTINGVALUE"
                                     + ",SETTINGDEFAULTVALUES"
                                     + ",SETTINGDEFAULTVALUES"
                                     + ",:accountID"
@@ -3790,7 +3835,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + ",REMARKS"
                                     + ",ACCOUNTID"
                                     + ",VALUEFLAG"
-                            //+ ",CREATETIME"
+                                    //+ ",CREATETIME"
                                     + ",CREATEUSERID"
                                     + ",UPDATEUSERID"
                                     + ") "
@@ -3802,10 +3847,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                 + ",null"
                                 + ",:accountid"
                                 + ",'1'"
-                            //+ ",sysdate"
+                                //+ ",sysdate"
                                 + ",:createUserid"
                                 + ",:updateUserid"
-                            // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
+                           // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
                            + ")";
                         OracleParameter[] parmeters8 = new OracleParameter[]
                         {
@@ -3825,7 +3870,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + ",REMARKS"
                                     + ",ACCOUNTID"
                                     + ",VALUEFLAG"
-                            //+ ",CREATETIME"
+                                    //+ ",CREATETIME"
                                     + ",CREATEUSERID"
                                     + ",UPDATEUSERID"
                                     + ") "
@@ -3837,10 +3882,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                 + ",null"
                                 + ",:accountid"
                                 + ",'1'"
-                            //+ ",sysdate"
+                                //+ ",sysdate"
                                 + ",:createUserid"
                                 + ",:updateUserid"
-                            // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
+                           // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
                            + ")";
                         OracleParameter[] parmeters81 = new OracleParameter[]
                         {
@@ -3860,7 +3905,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                     + ",REMARKS"
                                     + ",ACCOUNTID"
                                     + ",VALUEFLAG"
-                            //+ ",CREATETIME"
+                                    //+ ",CREATETIME"
                                     + ",CREATEUSERID"
                                     + ",UPDATEUSERID"
                                     + ") "
@@ -3872,10 +3917,10 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                 + ",null"
                                 + ",:accountid"
                                 + ",'1'"
-                            //+ ",sysdate"
+                                //+ ",sysdate"
                                 + ",:createUserid"
                                 + ",:updateUserid"
-                            // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
+                           // + " FROM TP_MST_GoodsType WHERE ACCOUNTID IN (SELECT AccountID FROM TP_MST_User WHERE userCode=:userCode)";
                            + ")";
                         OracleParameter[] parmeters82 = new OracleParameter[]
                         {
@@ -3957,12 +4002,12 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     {
                         #region 更新帐套信息
                         string sqlString = "UPDATE TP_MST_Account SET "
-                            // 编码不允许修改
-                            //+ " AccountCode = :accountCode,"
+                                            // 编码不允许修改
+                                            //+ " AccountCode = :accountCode,"
                                             + " AccountName = :accountName,"
                                             + " Remarks = :remarks,"
                                             + " ValueFlag = :valueFlag,"
-                            //+ " UpdateTime = :updateTime,"
+                                            //+ " UpdateTime = :updateTime,"
                                             + " UpdateUserID = :updateUserID"
                                             + " WHERE AccountID = :accountID";
                         OracleParameter[] parmeters1 = new OracleParameter[]
@@ -4038,13 +4083,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                (:RptProcedureID,:RptProcedureCode,:RptProcedureName,
                                :RptProcedureType,:AccountID,                               
                                :CreateUserID,:UpdateUserID,:displayno)");
-                OracleParameter[] rptProcedureParas = new OracleParameter[] {  
+                OracleParameter[] rptProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
-                            rptProcedureId,ParameterDirection.Input),   
+                            rptProcedureId,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureCode",OracleDbType.NVarchar2,
-                            rptProcedureEntity.RptProcedureCode,ParameterDirection.Input),                               
+                            rptProcedureEntity.RptProcedureCode,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureName",OracleDbType.NVarchar2,
-                            rptProcedureEntity.RptProcedureName,ParameterDirection.Input),         
+                            rptProcedureEntity.RptProcedureName,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureType",OracleDbType.NVarchar2,
                             rptProcedureEntity.RptProcedureTpye,ParameterDirection.Input),
                             new OracleParameter(":AccountID",OracleDbType.Int32,
@@ -4080,13 +4125,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                Values
                                (:RptSProcedureID,:ProcedureID,:ProcedureCode,
                                :ProcedureName,:RptProcedureID,:CreateUserID)");
-                        OracleParameter[] rptSProcedureParas = new OracleParameter[] {  
+                        OracleParameter[] rptSProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptSProcedureID",OracleDbType.Int32,
-                            rptSProcedureId,ParameterDirection.Input),   
+                            rptSProcedureId,ParameterDirection.Input),
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
@@ -4120,13 +4165,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                Values
                                (:RptTProcedureID,:ProcedureID,:ProcedureCode,
                                :ProcedureName,:RptProcedureID,:CreateUserID)");
-                        OracleParameter[] rptTProcedureParas = new OracleParameter[] {  
+                        OracleParameter[] rptTProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptTProcedureID",OracleDbType.Int32,
-                            rptTProcedureId,ParameterDirection.Input),   
+                            rptTProcedureId,ParameterDirection.Input),
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
@@ -4201,21 +4246,21 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    displayno=:displayno
                              Where RptProcedureID=:RptProcedureID
                                And OPTimeStamp=:OPTimeStamp");
-                OracleParameter[] rptProcedureParas = new OracleParameter[] {  
+                OracleParameter[] rptProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptProcedureCode",OracleDbType.NVarchar2,
-                            rptProcedureEntity.RptProcedureCode,ParameterDirection.Input),                               
+                            rptProcedureEntity.RptProcedureCode,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureName",OracleDbType.NVarchar2,
-                            rptProcedureEntity.RptProcedureName,ParameterDirection.Input),         
+                            rptProcedureEntity.RptProcedureName,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureType",OracleDbType.NVarchar2,
                             rptProcedureEntity.RptProcedureTpye,ParameterDirection.Input),
                             new OracleParameter(":UpdateUserID",OracleDbType.Int32,
                             userInfo.UserID,ParameterDirection.Input),
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
-                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input), 
+                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input),
                             new OracleParameter(":OPTimeStamp",OracleDbType.TimeStamp,
                             rptProcedureEntity.OPTimeStamp,ParameterDirection.Input),
                                new OracleParameter(":displayno",OracleDbType.Int32,
-                            rptProcedureEntity.DisplayNo,ParameterDirection.Input), 
+                            rptProcedureEntity.DisplayNo,ParameterDirection.Input),
                 };
                 //连接数据库并返回结果
                 RowsCount = oracleTrConn.ExecuteNonQuery(sbSql.ToString(), rptProcedureParas);
@@ -4246,13 +4291,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                Values
                                (:RptSProcedureID,:ProcedureID,:ProcedureCode,
                                :ProcedureName,:RptProcedureID,:CreateUserID)");
-                                OracleParameter[] rptSProcedureParas = new OracleParameter[] {  
+                                OracleParameter[] rptSProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptSProcedureID",OracleDbType.Int32,
-                            rptSProcedureId,ParameterDirection.Input),   
+                            rptSProcedureId,ParameterDirection.Input),
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
@@ -4272,15 +4317,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    ProcedureCode=:ProcedureCode,
                                    ProcedureName=:ProcedureName
                              Where RptSProcedureID=:RptSProcedureID");
-                                OracleParameter[] rptProcedureUpdateParas = new OracleParameter[] {  
+                                OracleParameter[] rptProcedureUpdateParas = new OracleParameter[] {
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptSProcedureID",OracleDbType.Int32,
-                            drFor["RptSProcedureID"],ParameterDirection.Input), 
+                            drFor["RptSProcedureID"],ParameterDirection.Input),
                              };
                                 //连接数据库并返回结果
                                 RowsCount = oracleTrConn.ExecuteNonQuery(sbSql.ToString(), rptProcedureUpdateParas);
@@ -4293,7 +4338,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                        ");
                                 OracleParameter[] rptProcedureDelParas = new OracleParameter[] {
                             new OracleParameter(":RptSProcedureID",OracleDbType.Int32,
-                            drFor["RptSProcedureID",DataRowVersion.Original],ParameterDirection.Input),                                                
+                            drFor["RptSProcedureID",DataRowVersion.Original],ParameterDirection.Input),
                             };
                                 RowsCount += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), rptProcedureDelParas);
                             }
@@ -4320,13 +4365,13 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                Values
                                (:RptTProcedureID,:ProcedureID,:ProcedureCode,
                                :ProcedureName,:RptProcedureID,:CreateUserID)");
-                                OracleParameter[] rptSProcedureParas = new OracleParameter[] {  
+                                OracleParameter[] rptSProcedureParas = new OracleParameter[] {
                             new OracleParameter(":RptTProcedureID",OracleDbType.Int32,
-                            rptTProcedureId,ParameterDirection.Input),   
+                            rptTProcedureId,ParameterDirection.Input),
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
@@ -4346,15 +4391,15 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    ProcedureCode=:ProcedureCode,
                                    ProcedureName=:ProcedureName
                              Where RptTProcedureID=:RptTProcedureID");
-                                OracleParameter[] rptProcedureUpdateParas = new OracleParameter[] {  
+                                OracleParameter[] rptProcedureUpdateParas = new OracleParameter[] {
                             new OracleParameter(":ProcedureID",OracleDbType.Int32,
-                            drFor["ProcedureID"],ParameterDirection.Input),                               
+                            drFor["ProcedureID"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureCode",OracleDbType.NVarchar2,
-                            drFor["ProcedureCode"],ParameterDirection.Input),         
+                            drFor["ProcedureCode"],ParameterDirection.Input),
                             new OracleParameter(":ProcedureName",OracleDbType.NVarchar2,
                             drFor["ProcedureName"],ParameterDirection.Input),
                             new OracleParameter(":RptTProcedureID",OracleDbType.Int32,
-                            drFor["RptTProcedureID"],ParameterDirection.Input), 
+                            drFor["RptTProcedureID"],ParameterDirection.Input),
                              };
                                 //连接数据库并返回结果
                                 RowsCount = oracleTrConn.ExecuteNonQuery(sbSql.ToString(), rptProcedureUpdateParas);
@@ -4367,7 +4412,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                        ");
                                 OracleParameter[] rptProcedureDelParas = new OracleParameter[] {
                             new OracleParameter(":RptTProcedureID",OracleDbType.Int32,
-                            drFor["RptTProcedureID",DataRowVersion.Original],ParameterDirection.Input),                                                
+                            drFor["RptTProcedureID",DataRowVersion.Original],ParameterDirection.Input),
                             };
                                 RowsCount += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), rptProcedureDelParas);
                             }
@@ -4431,8 +4476,8 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                Set ValueFlag = 0
                              Where RptProcedureID=:RptProcedureID
                                And OPTimeStamp=:OPTimeStamp");
-                OracleParameter[] rptDelParas = new OracleParameter[] {  
-                                 
+                OracleParameter[] rptDelParas = new OracleParameter[] {
+
                             new OracleParameter(":RptProcedureID",OracleDbType.NVarchar2,
                             rptProcedureEntity.RptProcedureID,ParameterDirection.Input),
                             new OracleParameter(":OPTimeStamp",OracleDbType.TimeStamp,
@@ -4453,7 +4498,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                        ");
                     OracleParameter[] DeleteRptSParas = new OracleParameter[] {
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
-                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input),                                                
+                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input),
                         };
                     RowsCount += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), DeleteRptSParas);
 
@@ -4463,7 +4508,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                        ");
                     OracleParameter[] DeleteRPTTParas = new OracleParameter[] {
                             new OracleParameter(":RptProcedureID",OracleDbType.Int32,
-                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input),                                                
+                            rptProcedureEntity.RptProcedureID,ParameterDirection.Input),
                         };
                     //删除质量考核产品明细数据(右边对应列数据)
                     RowsCount += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), DeleteRPTTParas);
@@ -4618,7 +4663,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                         string sqlReturnStr = oracleTrConn.GetSqlResultToStr(sqlString, oracleParameter);
                         if (!Constant.INT_IS_ZERO.ToString().Equals(sqlReturnStr))
                         {
-                            returnResult =-1;
+                            returnResult = -1;
                             break;
                         }
                         #endregion
@@ -4791,7 +4836,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                             + "(:pUserID"
                                             + ",:pFunctionCode"
                                             + ",:pCreateUserID)";
-                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                             {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pUserID", OracleDbType.Int32, dataRow["UserID"], ParameterDirection.Input),
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":pFunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode"].ToString(), ParameterDirection.Input),
@@ -4802,7 +4847,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     else if (dataRow.RowState == DataRowState.Deleted)
                     {
                         string sqlDelete = "delete from TP_MST_UserRight where UserID=:UserID and FunctionCode=:FunctionCode";
-                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                             {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":FunctionCode",OracleDbType.Varchar2, dataRow["FunctionCode",DataRowVersion.Original].ToString(), ParameterDirection.Input),
@@ -4867,7 +4912,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                                    + " ,:PurviewType"
                                    + " ,:CreateUserID) ";
 
-                            Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                            Oracle.ManagedDataAccess.Client.OracleParameter[] paras2 = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                            {
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID",Convert.ToInt32(dataRow["UserID"])),
                                new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID", Convert.ToInt32(dataRow["PurviewID"])),
@@ -4881,7 +4926,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                     else if (dataRow.RowState == DataRowState.Deleted)
                     {
                         string sqlDelete = "delete from TP_MST_UserPurview where UserID=:UserID and PurviewID=:PurviewID and PurviewType=:PurviewType";
-                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[] 
+                        Oracle.ManagedDataAccess.Client.OracleParameter[] paras2Delete = new Oracle.ManagedDataAccess.Client.OracleParameter[]
                             {
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":UserID", OracleDbType.Int32, dataRow["UserID",DataRowVersion.Original], ParameterDirection.Input),
                                 new Oracle.ManagedDataAccess.Client.OracleParameter(":PurviewID",OracleDbType.Int32, dataRow["PurviewID",DataRowVersion.Original].ToString(), ParameterDirection.Input),
@@ -5660,7 +5705,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 foreach (DataRow dataRow in dataDefectData.Rows)
                 {
                     //如果缺陷简称为空默认为缺陷名称
-                    if(string.IsNullOrEmpty(dataRow["S_NAME"] +""))
+                    if (string.IsNullOrEmpty(dataRow["S_NAME"] + ""))
                     {
                         dataRow["S_NAME"] = dataRow["DefectName"];
                     }
@@ -5850,7 +5895,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                 foreach (DataRow dataRow in dataDefectData.Rows)
                 {
                     //如果简称为空默认为缺陷位置名称
-                    if(string.IsNullOrEmpty(dataRow["S_NAME"] +""))
+                    if (string.IsNullOrEmpty(dataRow["S_NAME"] + ""))
                     {
                         dataRow["S_NAME"] = dataRow["DefectPositionName"];
                     }
@@ -6192,7 +6237,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             user.AccountID,ParameterDirection.Input),
                         new OracleParameter(":DisplayNo",OracleDbType.Int32,
                               detailInfo["DisplayNo"],ParameterDirection.Input)
-                       
+
                     };
                         //执行插入语句并累加成功插入次数
                         detailReturn += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), DetailParas);
@@ -6274,7 +6319,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
                             user.AccountID,ParameterDirection.Input),
                         new OracleParameter(":DisplayNo",OracleDbType.Int32,
                              detailInfo["DisplayNo"],ParameterDirection.Input)
-                       
+
                     };
                         //执行插入语句并累加成功插入次数
                         detailReturn += oracleTrConn.ExecuteNonQuery(sbSql.ToString(), DetailParas);

+ 10 - 0
WCF.Service/WCF.DataModels/SystemModule/UserEntity.cs

@@ -19,6 +19,7 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
     [DataContract]
     public class SUserEntity
     {
+
         /// <summary>
         /// 用户ID
         /// </summary>
@@ -366,5 +367,14 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             get;
             set;
         }
+        /// <summary>
+        /// AD域
+        /// </summary>
+        [DataMember]
+        public string AD_USER_CODE
+        {
+            get;
+            set;
+        }
     }
 }