修正成型线编辑时成型班长保存不上

DK.Basics/WFControls/11_Standard/09_SearchBox/ScbSearchBox.cs

@@ -603,6 +603,12 @@ namespace Dongke.WinForm.Controls
 			}
 		}
 
+        public object[] InitItems
+        {
+            get;
+            private set;
+        }
+
 		/// <summary>
 		/// 获取选择的项目的值。
 		/// </summary>
@@ -1040,13 +1046,14 @@ namespace Dongke.WinForm.Controls
 		/// </summary>
 		/// <param name="text"></param>
 		/// <param name="value"></param>
-		public virtual void InitValue(string text, object value)
+		public virtual void InitValue(string text, object value, params object[] items)
 		{
 			this._initText = text;
 			this._initValue = value;
 			this.txtCondition1.Text = text;
 			this._valueFrom = SearchBoxValueFrom.InitValue;
-		}
+            InitItems = items;
+        }
 
 		///// <summary>
 		///// 关闭查询窗体

DK.Client/PCModule/F_PC_0102_1_1.cs

@@ -17,6 +17,7 @@ using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Client.CommonModule;
 using Dongke.IBOSS.PRD.Client.Controls;
+using Dongke.IBOSS.PRD.Client.DataModels;
 using Dongke.IBOSS.PRD.WCF.DataModels;
 using Dongke.IBOSS.PRD.WCF.Proxys;
 
@@ -346,8 +347,17 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, errorAddress),
 						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
 					return;
-				}
-				DataTable dtInfo = this.dgvDetail.DataSource as DataTable;
+                }
+
+                if (LogInUserInfo.CurrentUser.CurrentUserEntity.AccountCode == "imex" &&
+                this.scbUser1.SearchedItem == null)
+                {
+                    MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "成型班长"),
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+                    return;
+                }
+
+                DataTable dtInfo = this.dgvDetail.DataSource as DataTable;
 				if (dtInfo.Rows.Count == Constant.INT_IS_ZERO)
 				{
 					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "模具信息"), this.Text,

DK.Client/PCModule/F_PC_0103_1.cs

@@ -102,7 +102,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 			this.dgvUser.ReadOnly = true;
 			this.c_GroupBox1.Enabled = false;
 
-            this.scbUser1.DisplayMember = "UserCode";
+            this.scbUser1.DisplayMember = "USERNAMECode";
             this.scbUser1.ValueMember = "UserID";
 
             if (this._gmouldstatus == 0)
@@ -204,6 +204,15 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
 					return;
 				}
+
+                if (LogInUserInfo.CurrentUser.CurrentUserEntity.AccountCode == "imex" &&
+                   this.scbUser1.SearchedItem == null)
+                {
+                    MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "成型班长"),
+                        this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+                    return;
+                }
+
 				//this._lineEntity.BUILDINGNO = this.txtBuildingNo.Text.Trim();
 				//this._lineEntity.FLOORNO = this.txtFloorNo.Text.Trim();
 				//this._lineEntity.GROUTINGLINENO = this.txtGroutingLineNo.Text.Trim();
@@ -222,6 +231,11 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                     this._lineEntity.MonitorID = Convert.ToInt32(this.scbUser1.SearchedValue);
                     this._lineEntity.MonitorCode = this.scbUser1.SearchedItem["Usercode"] + "";
                 }
+                else if(this.scbUser1.ValueFrom == WinForm.Controls.SearchBoxValueFrom.InitValue)
+                {
+                    //this._lineEntity.MonitorID = Convert.ToInt32(this.scbUser1.SearchedValue);
+                    //this._lineEntity.MonitorCode = this.scbUser1.InitItems[0] + "";
+                }
                 else
                 {
                     this._lineEntity.MonitorID = null;
@@ -1102,7 +1116,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
 					this.scbGMouldType.CheckedData = dsGroutingLine.Tables[0];
 					this.scbGMouldType.Text = dsGroutingLine.Tables[0].Rows[0]["GMouldTypeName"] + "";
 
-                    this.scbUser1.InitValue(_lineEntity.MonitorCode, _lineEntity.MonitorID);
+                    this.scbUser1.InitValue(_lineEntity.MonitorNameCode, _lineEntity.MonitorID, _lineEntity.MonitorCode);
 
                     //xuwei add 2019-11-13 高压注浆
                     this.HighPressureFlag.Checked = this._lineEntity.HIGHPRESSUREFLAG == 1 ? true : false;
@@ -1168,6 +1182,7 @@ namespace Dongke.IBOSS.PRD.Client.PCModule
                     this._lineEntity.MonitorID = Convert.ToInt32(mid);
                 }
                 this._lineEntity.MonitorCode = drGrouting["MonitorCode"]+"";
+                this._lineEntity.MonitorNameCode = drGrouting["MonitorNameCode"] + "";
                 this._lineEntity.BEGINUSEDDATE = Convert.ToDateTime(drGrouting["BEGINUSEDDATE"]);
 				if (drGrouting["ENDUSEDDATE"].ToString() != string.Empty && drGrouting["ENDUSEDDATE"] != DBNull.Value)
 				{

WCF.Service/WCF.DataModels/PCModule/GroutingLineEntity.cs

@@ -185,6 +185,15 @@ namespace Dongke.IBOSS.PRD.WCF.DataModels
             set;
             get;
         }
+        /// <summary>
+        /// 成型班长
+        /// </summary>
+        [DataMember]
+        public string MonitorNameCode
+        {
+            set;
+            get;
+        }
 
         /// <summary>
         /// 开始使用日期