金蝶对应代码添加功能删除查重金蝶限制 新增创建人 创建时间 修改人修改时间列

DK.Client/SystemModule/F_MST_1301.Designer.cs

@@ -58,6 +58,9 @@
 			this.LOGONAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.KINGDEECODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CREATEUSER = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.UPDATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.UPDATEUSER = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvGoosKingdeecode)).BeginInit();
@@ -351,7 +354,10 @@
             this.GLAZETYPE,
             this.LOGONAME,
             this.KINGDEECODE,
-            this.CREATETIME});
+            this.CREATETIME,
+            this.CREATEUSER,
+            this.UPDATETIME,
+            this.UPDATEUSER});
 			this.dgvGoosKingdeecode.ColumnTreeView = null;
 			this.dgvGoosKingdeecode.ContextMenuVisible = ((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags)((Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.Refine | Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView.ContextMenuVisibleFlags.FileOut)));
 			this.dgvGoosKingdeecode.DynamicColumnName = "";
@@ -429,6 +435,27 @@
 			this.CREATETIME.Name = "CREATETIME";
 			this.CREATETIME.ReadOnly = true;
 			// 
+			// CREATEUSER
+			// 
+			this.CREATEUSER.DataPropertyName = "CREATEUSER";
+			this.CREATEUSER.HeaderText = "创建人";
+			this.CREATEUSER.Name = "CREATEUSER";
+			this.CREATEUSER.ReadOnly = true;
+			// 
+			// UPDATETIME
+			// 
+			this.UPDATETIME.DataPropertyName = "UPDATETIME";
+			this.UPDATETIME.HeaderText = "修改时间";
+			this.UPDATETIME.Name = "UPDATETIME";
+			this.UPDATETIME.ReadOnly = true;
+			// 
+			// UPDATEUSER
+			// 
+			this.UPDATEUSER.DataPropertyName = "UPDATEUSER";
+			this.UPDATEUSER.HeaderText = "修改人";
+			this.UPDATEUSER.Name = "UPDATEUSER";
+			this.UPDATEUSER.ReadOnly = true;
+			// 
 			// F_MST_1301
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -479,5 +506,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn LOGONAME;
 		private System.Windows.Forms.DataGridViewTextBoxColumn KINGDEECODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn CREATEUSER;
+		private System.Windows.Forms.DataGridViewTextBoxColumn UPDATETIME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn UPDATEUSER;
 	}
 }

DK.Client/SystemModule/F_MST_1301.resx

@@ -227,6 +227,15 @@
   <metadata name="CREATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="CREATEUSER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UPDATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="UPDATEUSER.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>49</value>
   </metadata>

DK.Client/SystemModule/F_MST_1302.cs

@@ -283,7 +283,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			else if (Convert.ToInt32(sre.OtherStatus) == -1001)
 			{
 				MessageBox.Show(string.Format(Messages.MSG_CMN_W007,
-							"存在相同金蝶代码"),
+							"存在相同数据"),
 							"",
 							MessageBoxButtons.OK,
 							MessageBoxIcon.Warning);

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1296,11 +1296,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 									TP_MST_GOODSKINGDEECODE.GLAZETYPE,
 									TP_MST_GOODSKINGDEECODE.LOGONAME,
 									TP_MST_GOODSKINGDEECODE.KINGDEECODE,
-									TP_MST_GOODSKINGDEECODE.CREATETIME
+									TP_MST_GOODSKINGDEECODE.CREATETIME,
+									TP_MST_USER.USERNAME AS CREATEUSER,
+									TP_MST_GOODSKINGDEECODE.UPDATETIME AS UPDATETIME,
+									USERS.USERNAME AS UPDATEUSER
 								FROM
 									TP_MST_GOODSKINGDEECODE
 									LEFT JOIN TP_MST_GOODS gd on gd.GOODSCODE=TP_MST_GOODSKINGDEECODE.GOODSCODE
-								WHERE 1=1  AND TP_MST_GOODSKINGDEECODE.valueflag=1";
+									LEFT JOIN TP_MST_USER ON TP_MST_GOODSKINGDEECODE.CREATEUSERID=TP_MST_USER.USERID 
+									LEFT JOIN TP_MST_USER USERS ON TP_MST_GOODSKINGDEECODE.UPDATEUSERID=USERS.USERID 
+									WHERE 1=1  AND TP_MST_GOODSKINGDEECODE.valueflag=1 ";
 				if (!string.IsNullOrEmpty(cre.Properties["GoodsCode"].ToString()))
 				{
 					sqlString += " AND TP_MST_GOODSKINGDEECODE.GOODSCODE like :GOODSCODE";
@@ -1404,10 +1409,18 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					//如果版面信息是新建的情况下，是否存在相同版面编码
 					if (cre.Properties["FromStatus"].ToString() == "Add")
 					{
-						sqlString = @"SELECT 1 FROM TP_MST_GOODSKINGDEECODE WHERE KINGDEECODE = :KINGDEECODE  AND valueflag=1";
-
-						paras = new OracleParameter[] { new OracleParameter(":KINGDEECODE", cre.Properties["KINGDEECODE"].ToString()), };
-						dt = new DataTable();
+						sqlString = @"SELECT 1 FROM TP_MST_GOODSKINGDEECODE
+													WHERE
+														KINGDEECODE = :KINGDEECODE  AND GOODSCODE =:GOODSCODE   
+														AND GLAZETYPE =:GLAZETYPE AND LOGONAME =:LOGONAME
+														AND valueflag=1";
+
+						paras = new OracleParameter[] { new OracleParameter(":KINGDEECODE", cre.Properties["KINGDEECODE"].ToString()),
+								new OracleParameter(":GOODSCODE", cre.Properties["GOODSCODE"].ToString()),
+								new OracleParameter(":GLAZETYPE", cre.Properties["GLAZETYPE"].ToString()) ,
+								new OracleParameter(":LOGONAME", cre.Properties["LOGONAME"].ToString()) ,
+							};
+					dt = new DataTable();
 						dt = conn.GetSqlResultToDt(sqlString, paras);
 						if (dt != null && dt.Rows.Count > 0)
 						{
@@ -1425,18 +1438,23 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 											GLAZETYPE,
 											LOGONAME,
 											KINGDEECODE,
+											CREATEUSERID,
+											UPDATEUSERID,
 											VALUEFLAG
 										) VALUES(
 											:GOODSCODE,
 											:GLAZETYPE,
 											:LOGONAME,
 											:KINGDEECODE,
+											:CREATEUSERID,:UPDATEUSERID,
 											 '1' )";
 						paras = new OracleParameter[] {
 					new OracleParameter(":GOODSCODE", cre.Properties["GOODSCODE"].ToString()),
 					new OracleParameter(":GLAZETYPE", cre.Properties["GLAZETYPE"].ToString()) ,
 					new OracleParameter(":LOGONAME", cre.Properties["LOGONAME"].ToString()) ,
 					new OracleParameter(":KINGDEECODE", cre.Properties["KINGDEECODE"].ToString()) ,
+					new OracleParameter(":CREATEUSERID", sUserInfo.UserID) ,
+					new OracleParameter(":UPDATEUSERID", sUserInfo.UserID) ,
 				};
 					}
 					#endregion
@@ -1463,7 +1481,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 												GOODSCODE=:GOODSCODE,
 												GLAZETYPE = :GLAZETYPE,
 												LOGONAME =:LOGONAME,
-												KINGDEECODE = :KINGDEECODE
+												KINGDEECODE = :KINGDEECODE,
+												UPDATEUSERID =:UPDATEUSERID
+												UPDATETIME=SYSDATE
 											WHERE
 												KINGDEECODE = :KINGDEECODEONE";
 						paras = new OracleParameter[] {
@@ -1472,6 +1492,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					new OracleParameter(":LOGONAME", cre.Properties["LOGONAME"].ToString()) ,
 					new OracleParameter(":KINGDEECODEONE", cre.Properties["KINGDEECODEONE"].ToString()) ,
 					new OracleParameter(":KINGDEECODE", cre.Properties["KINGDEECODE"].ToString()) ,
+					new OracleParameter(":UPDATEUSERID", sUserInfo.UserID) ,
 				};
 					}
 				#endregion