Преглед изворни кода

模具对应产品表 修改在产明细表 显示产品等级名称bug

张忠帅 пре 1 година
родитељ
комит
ec8c65b458

+ 11 - 0
DK.Client/SystemModule/F_MST_1301.Designer.cs

@@ -53,6 +53,7 @@
 			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dgvGoosKingdeecode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GUID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GoodsNames = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.GLAZETYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.LOGONAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -350,6 +351,7 @@
 			this.dgvGoosKingdeecode.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.dgvGoosKingdeecode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.GOODSCODE,
+            this.GUID,
             this.GoodsNames,
             this.GLAZETYPE,
             this.LOGONAME,
@@ -398,6 +400,14 @@
 			this.GOODSCODE.Name = "GOODSCODE";
 			this.GOODSCODE.ReadOnly = true;
 			// 
+			// GUID
+			// 
+			this.GUID.DataPropertyName = "GUID";
+			this.GUID.HeaderText = "GUID";
+			this.GUID.Name = "GUID";
+			this.GUID.ReadOnly = true;
+			this.GUID.Visible = false;
+			// 
 			// GoodsNames
 			// 
 			this.GoodsNames.DataPropertyName = "GoodsName";
@@ -501,6 +511,7 @@
 		private Basics.BaseControls.C_Label c_Label3;
 		private Basics.BaseControls.C_TextBox goodscodetxt;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GUID;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsNames;
 		private System.Windows.Forms.DataGridViewTextBoxColumn GLAZETYPE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn LOGONAME;

+ 1 - 1
DK.Client/SystemModule/F_MST_1301.cs

@@ -277,7 +277,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			cre.NameSpace = "F_MST_1301";
 			cre.Name = "AddKingdeeCode";
 			cre.Properties["FromStatus"] ="Delete";
-			cre.Properties["KINGDEECODEONE"] = this.dgvGoosKingdeecode.SelectedRows[0].Cells["KINGDEECODE"].Value.ToString(); ;
+			cre.Properties["GUID"] = this.dgvGoosKingdeecode.SelectedRows[0].Cells["GUID"].Value.ToString(); ;
 			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 			if (sre.OtherStatus > 0)
 			{

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

@@ -212,6 +212,9 @@
   <metadata name="GOODSCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="GUID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="GoodsNames.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 4 - 1
DK.Client/SystemModule/F_MST_1302.cs

@@ -26,6 +26,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private string lognameOne;
 
 		private string GLAZETYPEOne;
+
+		private string GUID;
 		#endregion
 
 		#region 构造函数
@@ -70,7 +72,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 						this.txtKingdeeCode.Text = KingdeeCode;
 						//产品编码
 						this.scbGoodsCode.Text = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
-
+						GUID= sre.Data.Tables[0].Rows[0]["GUID"].ToString();
 
 					}
 				}
@@ -305,6 +307,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			cre.Properties["KINGDEECODE"] = this.txtKingdeeCode.Text.Trim();
 			cre.Properties["KINGDEECODEONE"] = KingdeeCodeOne.Trim();
 			cre.Properties["FromStatus"] = FromStatus.ToString();
+			cre.Properties["GUID"] = GUID;
 			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 			this.btnSave.Enabled = true;
 			this.btnCancel.Enabled = true;

+ 418 - 0
DK.Client/SystemModule/F_MST_1401.Designer.cs

@@ -0,0 +1,418 @@
+using System;
+
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{
+	partial class F_MST_1401
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_MST_1401));
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+			this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
+			this.delBtn = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.lblGoodsCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.gbxCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_GroupBox();
+			this.mouldNameLabel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.mouldName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.goodscodetxt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.mouldLable = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.txtMOULDGOODSCODE = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.dgvGoosKingdeecode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.GoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MOULDGOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.MOULDNAMES = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.guid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate.SuspendLayout();
+			this.gbxCondition.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvGoosKingdeecode)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// tsrOperate
+			// 
+			this.tsrOperate.AutoSize = false;
+			this.tsrOperate.BackColor = System.Drawing.SystemColors.Control;
+			this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.SystemModule.Resource1.functionbackground;
+			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnAdd,
+            this.tsbtnEdit,
+            this.delBtn,
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+			this.tsrOperate.Name = "tsrOperate";
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1128, 35);
+			this.tsrOperate.TabIndex = 1;
+			// 
+			// tsbtnAdd
+			// 
+			this.tsbtnAdd.AutoSize = false;
+			this.tsbtnAdd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdd.Name = "tsbtnAdd";
+			this.tsbtnAdd.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnAdd.Text = "新建(&N)";
+			this.tsbtnAdd.Click += new System.EventHandler(this.tsbtnAdd_Click);
+			// 
+			// tsbtnEdit
+			// 
+			this.tsbtnEdit.AutoSize = false;
+			this.tsbtnEdit.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnEdit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnEdit.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnEdit.Name = "tsbtnEdit";
+			this.tsbtnEdit.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnEdit.Text = "编辑(&E)";
+			this.tsbtnEdit.Click += new System.EventHandler(this.tsbtnEdit_Click);
+			// 
+			// delBtn
+			// 
+			this.delBtn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.delBtn.Image = ((System.Drawing.Image)(resources.GetObject("delBtn.Image")));
+			this.delBtn.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.delBtn.Name = "delBtn";
+			this.delBtn.Size = new System.Drawing.Size(33, 32);
+			this.delBtn.Text = "删除";
+			this.delBtn.Click += new System.EventHandler(this.delBtn_Click);
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// lblGoodsCode
+			// 
+			this.lblGoodsCode.AutoSize = true;
+			this.lblGoodsCode.BackColor = System.Drawing.SystemColors.Control;
+			this.lblGoodsCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lblGoodsCode.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.lblGoodsCode.Location = new System.Drawing.Point(16, 24);
+			this.lblGoodsCode.Name = "lblGoodsCode";
+			this.lblGoodsCode.Size = new System.Drawing.Size(53, 12);
+			this.lblGoodsCode.TabIndex = 3;
+			this.lblGoodsCode.Text = "产品编码";
+			// 
+			// btnSearch
+			// 
+			this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnSearch.BackColor = System.Drawing.Color.Gray;
+			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
+			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnSearch.ForeColor = System.Drawing.Color.White;
+			this.btnSearch.Location = new System.Drawing.Point(940, 14);
+			this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			this.btnSearch.Name = "btnSearch";
+			this.btnSearch.Size = new System.Drawing.Size(85, 30);
+			this.btnSearch.TabIndex = 10;
+			this.btnSearch.Text = "查询(&Q)";
+			this.btnSearch.UseVisualStyleBackColor = false;
+			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+			// 
+			// btnClearCondition
+			// 
+			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.btnClearCondition.BackColor = System.Drawing.Color.Gray;
+			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
+			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
+			this.btnClearCondition.Location = new System.Drawing.Point(1031, 14);
+			this.btnClearCondition.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+			this.btnClearCondition.Name = "btnClearCondition";
+			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
+			this.btnClearCondition.TabIndex = 11;
+			this.btnClearCondition.Text = "清空条件(&C)";
+			this.btnClearCondition.UseVisualStyleBackColor = false;
+			this.btnClearCondition.Click += new System.EventHandler(this.btnClearCondition_Click);
+			// 
+			// gbxCondition
+			// 
+			this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
+			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.mouldNameLabel);
+			this.gbxCondition.Controls.Add(this.mouldName);
+			this.gbxCondition.Controls.Add(this.goodscodetxt);
+			this.gbxCondition.Controls.Add(this.mouldLable);
+			this.gbxCondition.Controls.Add(this.txtMOULDGOODSCODE);
+			this.gbxCondition.Controls.Add(this.btnClearCondition);
+			this.gbxCondition.Controls.Add(this.btnSearch);
+			this.gbxCondition.Controls.Add(this.lblGoodsCode);
+			this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.gbxCondition.IsMustInput = false;
+			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
+			this.gbxCondition.Name = "gbxCondition";
+			this.gbxCondition.OriginalHeight = -1;
+			this.gbxCondition.Size = new System.Drawing.Size(1128, 56);
+			this.gbxCondition.TabIndex = 23;
+			this.gbxCondition.TabStop = false;
+			this.gbxCondition.Text = "查询条件 ▼";
+			// 
+			// mouldNameLabel
+			// 
+			this.mouldNameLabel.AutoSize = true;
+			this.mouldNameLabel.BackColor = System.Drawing.SystemColors.Control;
+			this.mouldNameLabel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.mouldNameLabel.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.mouldNameLabel.Location = new System.Drawing.Point(414, 24);
+			this.mouldNameLabel.Name = "mouldNameLabel";
+			this.mouldNameLabel.Size = new System.Drawing.Size(53, 12);
+			this.mouldNameLabel.TabIndex = 89;
+			this.mouldNameLabel.Text = "模具名称";
+			// 
+			// mouldName
+			// 
+			this.mouldName.BackColor = System.Drawing.SystemColors.Window;
+			this.mouldName.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.mouldName.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.mouldName.ErrorMessage = "";
+			this.mouldName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.mouldName.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.mouldName.Location = new System.Drawing.Point(473, 20);
+			this.mouldName.MaxLength = 50;
+			this.mouldName.Name = "mouldName";
+			this.mouldName.Size = new System.Drawing.Size(120, 21);
+			this.mouldName.TabIndex = 88;
+			// 
+			// goodscodetxt
+			// 
+			this.goodscodetxt.BackColor = System.Drawing.SystemColors.Window;
+			this.goodscodetxt.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.goodscodetxt.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.goodscodetxt.ErrorMessage = "";
+			this.goodscodetxt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.goodscodetxt.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.goodscodetxt.Location = new System.Drawing.Point(77, 20);
+			this.goodscodetxt.MaxLength = 50;
+			this.goodscodetxt.Name = "goodscodetxt";
+			this.goodscodetxt.Size = new System.Drawing.Size(120, 21);
+			this.goodscodetxt.TabIndex = 87;
+			// 
+			// mouldLable
+			// 
+			this.mouldLable.AutoSize = true;
+			this.mouldLable.BackColor = System.Drawing.SystemColors.Control;
+			this.mouldLable.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.mouldLable.ForeColor = System.Drawing.SystemColors.ControlText;
+			this.mouldLable.Location = new System.Drawing.Point(215, 24);
+			this.mouldLable.Name = "mouldLable";
+			this.mouldLable.Size = new System.Drawing.Size(53, 12);
+			this.mouldLable.TabIndex = 19;
+			this.mouldLable.Text = "模具代码";
+			// 
+			// txtMOULDGOODSCODE
+			// 
+			this.txtMOULDGOODSCODE.BackColor = System.Drawing.SystemColors.Window;
+			this.txtMOULDGOODSCODE.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtMOULDGOODSCODE.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtMOULDGOODSCODE.ErrorMessage = "";
+			this.txtMOULDGOODSCODE.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtMOULDGOODSCODE.ImeMode = System.Windows.Forms.ImeMode.Off;
+			this.txtMOULDGOODSCODE.Location = new System.Drawing.Point(274, 20);
+			this.txtMOULDGOODSCODE.MaxLength = 50;
+			this.txtMOULDGOODSCODE.Name = "txtMOULDGOODSCODE";
+			this.txtMOULDGOODSCODE.Size = new System.Drawing.Size(120, 21);
+			this.txtMOULDGOODSCODE.TabIndex = 18;
+			// 
+			// dgvGoosKingdeecode
+			// 
+			this.dgvGoosKingdeecode.AllowUserToAddRows = false;
+			this.dgvGoosKingdeecode.AllowUserToDeleteRows = false;
+			this.dgvGoosKingdeecode.AllowUserToModifyRows = true;
+			dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+			this.dgvGoosKingdeecode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+			this.dgvGoosKingdeecode.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.dgvGoosKingdeecode.CellBackColorNochanged = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+			this.dgvGoosKingdeecode.CellBackColorReadOnly = System.Drawing.SystemColors.Control;
+			this.dgvGoosKingdeecode.CellHeight = 23;
+			this.dgvGoosKingdeecode.ChildNodeColumnName = null;
+			this.dgvGoosKingdeecode.ChildNodeColumnText = null;
+			this.dgvGoosKingdeecode.ColumnDeep = 1;
+			this.dgvGoosKingdeecode.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+			dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+			dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(58)))), ((int)(((byte)(70)))));
+			dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
+			dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+			dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+			dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+			this.dgvGoosKingdeecode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+			this.dgvGoosKingdeecode.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			this.dgvGoosKingdeecode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.GOODSCODE,
+            this.GoodsName,
+            this.MOULDGOODSCODE,
+            this.MOULDNAMES,
+            this.guid});
+			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 = "";
+			this.dgvGoosKingdeecode.EnableHeadersVisualStyles = false;
+			this.dgvGoosKingdeecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.dgvGoosKingdeecode.FormatQuantityColumns = null;
+			this.dgvGoosKingdeecode.HorizontalMergeColumn = null;
+			this.dgvGoosKingdeecode.IsAutoCountSum = true;
+			this.dgvGoosKingdeecode.IsAutoResizeColumns = false;
+			this.dgvGoosKingdeecode.IsClickF12 = false;
+			this.dgvGoosKingdeecode.IsOpenMergeCellFlag = false;
+			this.dgvGoosKingdeecode.IsSubTotalFlag = false;
+			this.dgvGoosKingdeecode.IsTopDeep = false;
+			this.dgvGoosKingdeecode.Location = new System.Drawing.Point(0, 100);
+			this.dgvGoosKingdeecode.MergeColumnNames = null;
+			this.dgvGoosKingdeecode.MergeDetailColumnNames = null;
+			this.dgvGoosKingdeecode.MergeDetailOnlyColumn = null;
+			this.dgvGoosKingdeecode.MergeOnlyColumn = null;
+			this.dgvGoosKingdeecode.Name = "dgvGoosKingdeecode";
+			this.dgvGoosKingdeecode.ReadOnly = true;
+			this.dgvGoosKingdeecode.RefreshAtHscroll = false;
+			this.dgvGoosKingdeecode.RowHeadersWidth = 50;
+			this.dgvGoosKingdeecode.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+			dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(159)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
+			this.dgvGoosKingdeecode.RowsDefaultCellStyle = dataGridViewCellStyle3;
+			this.dgvGoosKingdeecode.RowTemplate.Height = 21;
+			this.dgvGoosKingdeecode.Size = new System.Drawing.Size(1122, 404);
+			this.dgvGoosKingdeecode.SortOrderColumnName = null;
+			this.dgvGoosKingdeecode.TabIndex = 24;
+			this.dgvGoosKingdeecode.Tag = true;
+			this.dgvGoosKingdeecode.TotalSumColumns = null;
+			this.dgvGoosKingdeecode.ViewRowFilter = "";
+			// 
+			// GOODSCODE
+			// 
+			this.GOODSCODE.DataPropertyName = "GOODSCODE";
+			this.GOODSCODE.HeaderText = "产品编码";
+			this.GOODSCODE.Name = "GOODSCODE";
+			this.GOODSCODE.ReadOnly = true;
+			// 
+			// GoodsName
+			// 
+			this.GoodsName.DataPropertyName = "GOODSNAME";
+			this.GoodsName.HeaderText = "产品名称";
+			this.GoodsName.Name = "GoodsName";
+			this.GoodsName.ReadOnly = true;
+			// 
+			// MOULDGOODSCODE
+			// 
+			this.MOULDGOODSCODE.DataPropertyName = "MOULDGOODSCODE";
+			this.MOULDGOODSCODE.HeaderText = "模具代码";
+			this.MOULDGOODSCODE.Name = "MOULDGOODSCODE";
+			this.MOULDGOODSCODE.ReadOnly = true;
+			// 
+			// MOULDNAMES
+			// 
+			this.MOULDNAMES.DataPropertyName = "MOULDNAME";
+			this.MOULDNAMES.HeaderText = "模具名称";
+			this.MOULDNAMES.Name = "MOULDNAMES";
+			this.MOULDNAMES.ReadOnly = true;
+			// 
+			// guid
+			// 
+			this.guid.DataPropertyName = "GUID";
+			this.guid.HeaderText = "guid";
+			this.guid.Name = "guid";
+			this.guid.ReadOnly = true;
+			this.guid.Visible = false;
+			// 
+			// F_MST_1401
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(1128, 516);
+			this.Controls.Add(this.dgvGoosKingdeecode);
+			this.Controls.Add(this.gbxCondition);
+			this.Controls.Add(this.tsrOperate);
+			this.Name = "F_MST_1401";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "模具产品对应";
+			this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_MST_1401_FormClosed);
+			this.Load += new System.EventHandler(this.F_MST_1401_Load);
+			this.tsrOperate.ResumeLayout(false);
+			this.tsrOperate.PerformLayout();
+			this.gbxCondition.ResumeLayout(false);
+			this.gbxCondition.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.dgvGoosKingdeecode)).EndInit();
+			this.ResumeLayout(false);
+
+		}
+
+		#endregion
+
+		private Basics.BaseControls.C_ToolStrip tsrOperate;
+		private System.Windows.Forms.ToolStripButton tsbtnAdd;
+		private System.Windows.Forms.ToolStripButton tsbtnEdit;
+		private System.Windows.Forms.ToolStripButton tsbtnClose;
+		private Basics.BaseControls.C_Label lblGoodsCode;
+		private Basics.BaseControls.C_Button btnSearch;
+		private Basics.BaseControls.C_Button btnClearCondition;
+		private Basics.BaseControls.C_GroupBox gbxCondition;
+		private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
+		private Basics.BaseControls.C_DataGridView dgvGoosKingdeecode;
+		private Basics.BaseControls.C_Label mouldLable;
+		private Basics.BaseControls.C_TextBox txtMOULDGOODSCODE;
+		private System.Windows.Forms.ToolStripButton delBtn;
+		private Basics.BaseControls.C_TextBox goodscodetxt;
+		private Basics.BaseControls.C_Label mouldNameLabel;
+		private Basics.BaseControls.C_TextBox mouldName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn GoodsName;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MOULDGOODSCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn MOULDNAMES;
+		private System.Windows.Forms.DataGridViewTextBoxColumn guid;
+	}
+}

+ 263 - 0
DK.Client/SystemModule/F_MST_1401.cs

@@ -0,0 +1,263 @@
+/*******************************************************************************
+ * Copyright(c) 2014 DongkeSoft All rights reserved. / Confidential
+ * 类的信息:
+ *      1.程序名称:F_MST_1401.cs
+ *      2.功能描述:产品档案
+ * 编辑履历:
+ *      作者            日期                版本            修改内容
+ *      庄天威          2014/09/13          1.00            新建
+ *******************************************************************************/
+
+using System;
+using System.Data;
+using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Basics.DockPanel;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{
+	/// <summary>
+	/// 产品档案
+	/// </summary>
+	public partial class F_MST_1401 : DockPanelBase
+	{
+		#region 成员变量
+		private static F_MST_1401 _instance;		//单例模式
+		#endregion
+
+		#region 构造函数
+		public F_MST_1401()
+		{
+			InitializeComponent();
+			this.Text = "模具代码对应";
+			// 按钮
+			this.tsbtnAdd.Text = ButtonText.TSBTN_ADD;
+			this.tsbtnEdit.Text = ButtonText.TSBTN_EDIT;
+			this.tsbtnAdaptive.Text = ButtonText.TSBTN_ADAPTIVE;
+			this.tsbtnClose.Text = ButtonText.TSBTN_CLOSE;
+			this.btnSearch.Text = ButtonText.BTN_SEARCH;
+			this.btnClearCondition.Text = ButtonText.BTN_CLEARCONDITION;
+		}
+		#endregion
+
+		#region 单例模式
+		/// <summary>
+		/// 单例模式,防止重复创建窗体
+		/// </summary>
+		public static F_MST_1401 Instance
+		{
+			get
+			{
+				if (_instance == null)
+				{
+					_instance = new F_MST_1401();
+				}
+				return _instance;
+			}
+		}
+		#endregion
+
+		#region 事件
+		/// <summary>
+		/// 窗体加载
+		/// </summary>
+		private void F_MST_1401_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				this.dgvGoosKingdeecode.AutoGenerateColumns = false;
+				this.loadDataSource();
+				FormPermissionManager.FormPermissionControl(this.Name, this,
+				 Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.UserRightData,
+				 Dongke.IBOSS.PRD.Client.DataModels.LogInUserInfo.CurrentUser.CurrentUserEntity.FunctionData);
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 清空事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnClearCondition_Click(object sender, EventArgs e)
+		{
+			this.goodscodetxt.Clear();
+			this.txtMOULDGOODSCODE.Clear();
+			this.mouldName.Clear();
+		}
+
+		/// <summary>
+		/// 查询事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnSearch_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				this.DataSource = this.GetSearchData();
+				if (this.DataSource != null)
+				{
+					this.dgvGoosKingdeecode.DataSource = this.DataSource.Tables[0];
+				}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 新建事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnAdd_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				F_MST_1402 frmMST1402 = new F_MST_1402(Constant.FormMode.Add,"","","");
+				DialogResult dialogResult = frmMST1402.ShowDialog();
+				// 重新加载GridView
+				btnSearch_Click(sender, null);
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+
+		/// <summary>
+		/// 编辑事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnEdit_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				if (this.dgvGoosKingdeecode.SelectedRows.Count != 0)
+				{
+					string MOULDGOODSCODE = this.dgvGoosKingdeecode.SelectedRows[0].Cells["MOULDGOODSCODE"].Value.ToString();
+					string MOULDNAME = this.dgvGoosKingdeecode.SelectedRows[0].Cells["MOULDNAMES"].Value.ToString();
+					string GoodsCode = this.dgvGoosKingdeecode.SelectedRows[0].Cells["GOODSCODE"].Value.ToString();
+					F_MST_1402 frmFPC1402 = new F_MST_1402(Constant.FormMode.Edit, MOULDGOODSCODE, MOULDNAME, GoodsCode);
+					DialogResult dialogresult = frmFPC1402.ShowDialog();
+					btnSearch_Click(sender, null);
+				}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+		/// <summary>
+		/// 自适应列宽
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnAdaptive_Click(object sender, EventArgs e)
+		{
+			this.dgvGoosKingdeecode.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
+		}
+
+		/// <summary>
+		/// 关闭事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void tsbtnClose_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		/// <summary>
+		/// 窗体关闭事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_MST_1401_FormClosed(object sender, FormClosedEventArgs e)
+		{
+			_instance = null;
+		}
+		#endregion
+
+		#region 私有方法
+		private DataSet GetSearchData()
+		{
+			try
+			{
+				ClientRequestEntity cre = new ClientRequestEntity();
+				cre.NameSpace = "F_MST_1401";
+				cre.Name = "GetMouldGoodsCode";
+				cre.Properties["GoodsCode"] = this.goodscodetxt.Text;
+				cre.Properties["MOULDNAME"] = this.mouldName.Text;
+				cre.Properties["MOULDGOODSCODE"] = this.txtMOULDGOODSCODE.Text;
+				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+				{
+					return sre.Data;
+				}
+
+				return null;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+		}
+
+		/// <summary>
+		/// 下拉框获取数据
+		/// </summary>
+		private void loadDataSource()
+		{
+			
+}
+
+
+		#endregion
+
+		private void delBtn_Click(object sender, EventArgs e)
+		{
+			try
+			{
+		if (this.dgvGoosKingdeecode.SelectedRows.Count != 0)
+			{
+			ClientRequestEntity cre = new ClientRequestEntity();
+			cre.NameSpace = "F_MST_1401";
+			cre.Name = "AddMouldCode";
+			cre.Properties["FromStatus"] ="Delete";
+			cre.Properties["GUID"] = this.dgvGoosKingdeecode.SelectedRows[0].Cells["GUID"].Value.ToString(); ;
+			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+			if (sre.OtherStatus > 0)
+			{
+				DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+			}
+					btnSearch_Click(sender, null);//删除后重新查询数据
+				}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+	}
+}

+ 230 - 0
DK.Client/SystemModule/F_MST_1401.resx

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="delBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnSearch.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnClearCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="gbxCondition.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
+        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
+        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
+        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
+        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
+        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
+        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
+        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
+        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
+        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
+        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
+        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
+        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
+        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
+        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
+        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
+        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
+        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
+        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
+        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
+        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
+        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
+        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
+        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
+        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
+        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
+        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
+        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
+        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
+        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
+        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
+        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
+        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
+        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
+        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
+        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
+        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
+        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
+        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
+        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
+        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
+        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
+        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <metadata name="GOODSCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="GoodsName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MOULDGOODSCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MOULDNAMES.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="guid.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>
+</root>

+ 179 - 0
DK.Client/SystemModule/F_MST_1402.Designer.cs

@@ -0,0 +1,179 @@
+
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{
+	partial class F_MST_1402
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(F_MST_1402));
+			this.btnSave = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.btnCancel = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
+			this.c_Label5 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.c_Label4 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.txtMouldCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.scbGoodsCode = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoods();
+			this.lableName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
+			this.txtMouldName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_TextBox();
+			this.SuspendLayout();
+			// 
+			// btnSave
+			// 
+			this.btnSave.BackColor = System.Drawing.SystemColors.ControlDark;
+			this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
+			this.btnSave.Font = new System.Drawing.Font("宋体", 9F);
+			this.btnSave.ForeColor = System.Drawing.Color.White;
+			this.btnSave.Location = new System.Drawing.Point(244, 119);
+			this.btnSave.Name = "btnSave";
+			this.btnSave.Size = new System.Drawing.Size(85, 30);
+			this.btnSave.TabIndex = 75;
+			this.btnSave.Text = "保存(&S)";
+			this.btnSave.UseVisualStyleBackColor = false;
+			this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+			// 
+			// btnCancel
+			// 
+			this.btnCancel.BackColor = System.Drawing.SystemColors.ControlDark;
+			this.btnCancel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnCancel.BackgroundImage")));
+			this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.btnCancel.Font = new System.Drawing.Font("宋体", 9F);
+			this.btnCancel.ForeColor = System.Drawing.Color.White;
+			this.btnCancel.Location = new System.Drawing.Point(335, 119);
+			this.btnCancel.Name = "btnCancel";
+			this.btnCancel.Size = new System.Drawing.Size(85, 30);
+			this.btnCancel.TabIndex = 76;
+			this.btnCancel.Text = "关闭";
+			this.btnCancel.UseVisualStyleBackColor = false;
+			this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+			// 
+			// c_Label5
+			// 
+			this.c_Label5.AutoSize = true;
+			this.c_Label5.BackColor = System.Drawing.Color.Transparent;
+			this.c_Label5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.c_Label5.ForeColor = System.Drawing.Color.Red;
+			this.c_Label5.Location = new System.Drawing.Point(15, 23);
+			this.c_Label5.Name = "c_Label5";
+			this.c_Label5.Size = new System.Drawing.Size(53, 12);
+			this.c_Label5.TabIndex = 71;
+			this.c_Label5.Text = "产品编码";
+			this.c_Label5.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.ForeColor = System.Drawing.Color.Red;
+			this.c_Label4.Location = new System.Drawing.Point(228, 23);
+			this.c_Label4.Name = "c_Label4";
+			this.c_Label4.Size = new System.Drawing.Size(53, 12);
+			this.c_Label4.TabIndex = 70;
+			this.c_Label4.Text = "模具编码";
+			this.c_Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// txtMouldCode
+			// 
+			this.txtMouldCode.BackColor = System.Drawing.SystemColors.Window;
+			this.txtMouldCode.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtMouldCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtMouldCode.ErrorMessage = "";
+			this.txtMouldCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtMouldCode.Location = new System.Drawing.Point(287, 20);
+			this.txtMouldCode.MaxLength = 20;
+			this.txtMouldCode.Name = "txtMouldCode";
+			this.txtMouldCode.Size = new System.Drawing.Size(130, 21);
+			this.txtMouldCode.TabIndex = 69;
+			// 
+			// scbGoodsCode
+			// 
+			this.scbGoodsCode.CheckedData = null;
+			this.scbGoodsCode.DisplayMember = "GoodsCode";
+			this.scbGoodsCode.Location = new System.Drawing.Point(74, 20);
+			this.scbGoodsCode.Name = "scbGoodsCode";
+			this.scbGoodsCode.Size = new System.Drawing.Size(130, 21);
+			this.scbGoodsCode.TabIndex = 89;
+			// 
+			// lableName
+			// 
+			this.lableName.AutoSize = true;
+			this.lableName.BackColor = System.Drawing.Color.Transparent;
+			this.lableName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.lableName.ForeColor = System.Drawing.Color.Red;
+			this.lableName.Location = new System.Drawing.Point(15, 79);
+			this.lableName.Name = "lableName";
+			this.lableName.Size = new System.Drawing.Size(53, 12);
+			this.lableName.TabIndex = 91;
+			this.lableName.Text = "模具名称";
+			this.lableName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// txtMouldName
+			// 
+			this.txtMouldName.BackColor = System.Drawing.SystemColors.Window;
+			this.txtMouldName.BackgroundColor = System.Drawing.SystemColors.Window;
+			this.txtMouldName.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
+			this.txtMouldName.ErrorMessage = "";
+			this.txtMouldName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.txtMouldName.Location = new System.Drawing.Point(74, 76);
+			this.txtMouldName.MaxLength = 20;
+			this.txtMouldName.Name = "txtMouldName";
+			this.txtMouldName.Size = new System.Drawing.Size(130, 21);
+			this.txtMouldName.TabIndex = 90;
+			// 
+			// F_MST_1402
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.ClientSize = new System.Drawing.Size(431, 172);
+			this.Controls.Add(this.lableName);
+			this.Controls.Add(this.txtMouldName);
+			this.Controls.Add(this.scbGoodsCode);
+			this.Controls.Add(this.btnSave);
+			this.Controls.Add(this.btnCancel);
+			this.Controls.Add(this.c_Label5);
+			this.Controls.Add(this.c_Label4);
+			this.Controls.Add(this.txtMouldCode);
+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+			this.Name = "F_MST_1402";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "F_MST_1402";
+			this.Load += new System.EventHandler(this.F_MST_1402_Load);
+			this.ResumeLayout(false);
+			this.PerformLayout();
+
+		}
+
+		#endregion
+		private Basics.BaseControls.C_Button btnSave;
+		private Basics.BaseControls.C_Button btnCancel;
+		private Basics.BaseControls.C_Label c_Label5;
+		private Basics.BaseControls.C_Label c_Label4;
+		private Basics.BaseControls.C_TextBox txtMouldCode;
+		private Controls.SearchBox.ScbGoods scbGoodsCode;
+		private Basics.BaseControls.C_Label lableName;
+		private Basics.BaseControls.C_TextBox txtMouldName;
+	}
+}

+ 272 - 0
DK.Client/SystemModule/F_MST_1402.cs

@@ -0,0 +1,272 @@
+using Dongke.IBOSS.PRD.Basics.BaseControls;
+using Dongke.IBOSS.PRD.Basics.BaseResources;
+using Dongke.IBOSS.PRD.Client.CommonModule;
+using Dongke.IBOSS.PRD.WCF.DataModels;
+using Dongke.IBOSS.PRD.WCF.Proxys;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Dongke.IBOSS.PRD.Client.SystemModule
+{
+	public partial class F_MST_1402 : Form
+	{
+		#region 成员变量
+		// 编辑状态
+		private Constant.FormMode _editStatus;
+
+		private string MOULDGOODSCODE;
+
+		private string GOODSCODE;
+
+		private string MOULDNAME;
+
+		private string GUID;
+		#endregion
+
+		#region 构造函数
+		public F_MST_1402()
+		{
+			InitializeComponent();
+		}
+
+		public F_MST_1402(Constant.FormMode frmStatus, string MouldCode, string MouldNames, string GoodsCode)
+		{
+			InitializeComponent();
+			_editStatus = frmStatus;
+			// 设置窗口标题,当为新建状态时显示新建用户,当为编辑状态时显示编辑用户
+			if (frmStatus == Constant.FormMode.Add)
+			{
+				FromStatus = "Add";
+				this.Text = "新建";
+			}
+			else if (frmStatus == Constant.FormMode.Edit)
+			{
+				FromStatus = "Edit";
+				this.Text = "编辑";
+				MOULDGOODSCODE = MouldCode;
+				MOULDNAME = MouldNames;
+				if (!string.IsNullOrEmpty(MouldCode))
+				{
+					//CustomerCodeOne = CustomerCode;
+					ClientRequestEntity cre = new ClientRequestEntity();
+					cre.NameSpace = "F_MST_1401";
+					cre.Name = "GetMouldGoodsCode";
+					cre.Properties["MOULDGOODSCODE"] = MOULDGOODSCODE;
+					cre.Properties["GoodsCode"] = GoodsCode;
+					cre.Properties["MOULDNAME"] = MouldNames;
+					ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+					if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+					{
+						DataRow item = sre.Data.Tables[0].Rows[0];
+						this.txtMouldCode.Text = MOULDGOODSCODE;
+						//产品编码
+						this.scbGoodsCode.Text = sre.Data.Tables[0].Rows[0]["GOODSCODE"].ToString();
+						GUID= sre.Data.Tables[0].Rows[0]["GUID"].ToString();
+
+					}
+				}
+			}
+			// 工具栏按钮文本赋值
+			this.btnSave.Text = ButtonText.BTN_SAVE;
+			this.btnCancel.Text = ButtonText.BTN_CLOSE;
+		}
+		#endregion
+
+		#region 属性
+		/// <summary>
+		/// 页面状态
+		/// </summary>
+		public string FromStatus
+		{
+			get;
+			set;
+		}
+		#endregion
+
+		#region 事件
+		/// <summary>
+		/// 保存事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnSave_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				//商品编码
+				if (string.IsNullOrEmpty(this.scbGoodsCode.Text.ToString()))
+				{
+					//必须输入
+					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "商品编码"),
+						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+					this.scbGoodsCode.Focus();
+					return;
+				}
+				if (string.IsNullOrEmpty(this.txtMouldCode.Text.ToString()))
+				{
+					//必须输入
+					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "模具编码"),
+						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+					this.txtMouldCode.Focus();
+					return;
+				}
+				if (string.IsNullOrEmpty(this.txtMouldName.Text.ToString()))
+				{
+					//必须输入
+					MessageBox.Show(string.Format(Messages.MSG_CMN_W005, "模具名称"),
+						this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
+					this.txtMouldCode.Focus();
+					return;
+				}
+				//int returnCustomerID = Constant.INT_IS_ZERO;
+				//_CustomerEntity = this.SetCustomerEntity();
+				if (_editStatus == Constant.FormMode.Add)
+				{
+					// 新建用户,返回新建的用户ID
+					this.btnSave.Enabled = false;
+					this.btnCancel.Enabled = false;
+					this.AddCustomerInfo();
+				}
+				if (_editStatus == Constant.FormMode.Edit)
+				{
+					this.btnSave.Enabled = false;
+					this.btnCancel.Enabled = false;
+					this.EditCustomer();
+					this.Close();
+				}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+		/// <summary>
+		/// 退出事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void btnCancel_Click(object sender, EventArgs e)
+		{
+
+		}
+		/// <summary>
+		/// 页面加载事件
+		/// </summary>
+		/// <param name="sender"></param>
+		/// <param name="e"></param>
+		private void F_MST_1402_Load(object sender, EventArgs e)
+		{
+			try
+			{
+				this.txtMouldCode.Clear();
+				this.txtMouldName.Clear();
+				this.txtMouldCode.Text = MOULDGOODSCODE;
+				this.txtMouldName.Text = MOULDNAME;
+
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
+		#endregion
+
+		#region 私有方法
+		/// <summary>
+		/// 下拉框获取数据
+		/// </summary>
+
+		private void Clear()
+		{
+			this.scbGoodsCode.ClearValue();
+			this.txtMouldCode.Clear();
+			this.txtMouldName.Clear();
+		}
+
+		private void AddCustomerInfo()
+		{
+			ClientRequestEntity cre = new ClientRequestEntity();
+			cre.NameSpace = "F_MST_1401";
+			cre.Name = "AddMouldCode";
+			if (!string.IsNullOrWhiteSpace(this.scbGoodsCode.Text))
+			{
+				if (this.scbGoodsCode.CheckedPKMember.Contains(","))
+				{
+					cre.Properties["GOODSCODE"] = scbGoodsCode.Text;
+				}
+				else
+				{
+					cre.Properties["GOODSCODE"] = scbGoodsCode.Text;
+				}
+			}
+			cre.Properties["MOULDGOODSCODE"] = this.txtMouldCode.Text.Trim();
+			cre.Properties["MOULDNAME"] = this.txtMouldName.Text.Trim();
+			cre.Properties["FromStatus"] = FromStatus.ToString();
+			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+			this.btnSave.Enabled = true;
+			this.btnCancel.Enabled = true;
+			if (sre.OtherStatus > 0)
+			{
+				DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+				this.Clear();
+				this.txtMouldCode.Focus();
+				return;
+			}
+			else if (Convert.ToInt32(sre.OtherStatus) == -1001)
+			{
+				MessageBox.Show(string.Format(Messages.MSG_CMN_W007,
+							"存在相同数据"),
+							"",
+							MessageBoxButtons.OK,
+							MessageBoxIcon.Warning);
+				return;
+			}
+		}
+
+		private void EditCustomer()
+		{
+			ClientRequestEntity cre = new ClientRequestEntity();
+			cre.NameSpace = "F_MST_1401";
+			cre.Name = "AddMouldCode";
+			if (!string.IsNullOrWhiteSpace(this.scbGoodsCode.Text))
+			{
+				cre.Properties["GOODSCODE"] = this.scbGoodsCode.Text;
+			}
+			cre.Properties["MOULDGOODSCODE"] = this.txtMouldCode.Text.Trim();
+			cre.Properties["MOULDNAME"] = this.txtMouldName.Text.Trim();
+			cre.Properties["GUID"] = GUID;
+			cre.Properties["FromStatus"] = FromStatus.ToString();
+			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+			this.btnSave.Enabled = true;
+			this.btnCancel.Enabled = true;
+			if (sre.OtherStatus > 0)
+			{
+				DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+				return;
+			}
+			else if (Convert.ToInt32(sre.OtherStatus) == -1001)
+			{
+				MessageBox.Show(string.Format(Messages.MSG_CMN_W007,
+							"存在相同数据"),
+							"",
+							MessageBoxButtons.OK,
+							MessageBoxIcon.Warning);
+return;
+}
+}
+
+
+	}
+}
+#endregion

+ 137 - 0
DK.Client/SystemModule/F_MST_1402.resx

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnSave.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnCancel.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAFUAAAAeCAYAAABdalL1AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        vAAADrwBlbxySQAAAI5JREFUaEPt0KERxCAUQMFrEImOowUsioJSAb3gaOLfnLjJRMNzT2wD+ymlhPb1
+        3mOMEWutMPUQUwGmAkwFmAowFWAqwFSAqQBTAaYCTAWYCnilXtcV2tdaM/U0UwGmAmqtT2rOObTvnzrn
+        NPUUUwGmAkwFmAowFWAqwFSAqYBf6n3fpp70Sk0phfY9qTO+PIZEBQZ3CrAAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

+ 18 - 0
DK.Client/SystemModule/SystemModule.csproj

@@ -122,6 +122,18 @@
     <Compile Include="F_MST_0412.Designer.cs">
       <DependentUpon>F_MST_0412.cs</DependentUpon>
     </Compile>
+    <Compile Include="F_MST_1402.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_MST_1402.Designer.cs">
+      <DependentUpon>F_MST_1402.cs</DependentUpon>
+    </Compile>
+    <Compile Include="F_MST_1401.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="F_MST_1401.Designer.cs">
+      <DependentUpon>F_MST_1401.cs</DependentUpon>
+    </Compile>
     <Compile Include="F_MST_1301.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -458,6 +470,12 @@
     <EmbeddedResource Include="F_MST_0412.resx">
       <DependentUpon>F_MST_0412.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="F_MST_1402.resx">
+      <DependentUpon>F_MST_1402.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="F_MST_1401.resx">
+      <DependentUpon>F_MST_1401.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="F_MST_1301.resx">
       <DependentUpon>F_MST_1301.cs</DependentUpon>
     </EmbeddedResource>

+ 4 - 3
DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -2214,8 +2214,9 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					"  TP_PM_GroutingDailyDetail.delivertime, " +
 					"  TP_PM_InProduction.proceduretime, " +
 					"  TP_PM_InProduction.Remarks, " +
-					"  TP_PM_InProduction.GoodsLevelID,TP_MST_GoodsLevel.GOODSLEVELNAME, " +
-					"  TP_PM_InProduction.GoodsLevelTypeID,TP_SYS_GoodsLevelType.GOODSLEVELTYPENAME, " +
+					"	TP_MST_GoodsLevel.GOODSLEVELNAME AS GOODSLEVELTYPENAME,"+
+					"TP_PM_InProduction.GoodsLevelTypeID,"+
+					"TP_SYS_GoodsLevelType.GOODSLEVELTYPENAME AS GOODSLEVELNAME,"+
 					"  TP_PM_InProduction.AccountID,TP_PM_InProduction.ValueFlag, " +
                     "  TP_PM_GroutingDailyDetail.glazingroom," +
                     "  TP_PM_InProduction.CreateTime,TP_PM_InProduction.CreateUserID,B.USERNAME as CreateUserName, " +
@@ -2240,7 +2241,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
 					"  left join TP_MST_Goods Goods  on TP_PM_InProduction.GoodsID=Goods.GoodsID " +
 					"  left join tp_mst_goodstype gt on gt.goodstypeid = Goods.goodstypeid " +
 					"  Where TP_PM_InProduction.ValueFlag = 1 " +
-					"  and TP_PM_InProduction.AccountID=:AccountID  AND TP_PM_InProduction.GoodsLevelTypeID <>20";   //排除在产品明细表 次品数据 2024-5-15
+					"  and TP_PM_InProduction.AccountID=:AccountID ";
 
 			return selSql;
 		}

+ 204 - 5
DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1291,6 +1291,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				OracleParameter[] paras = new OracleParameter[] { };
 				string sqlString = @"
 								SELECT
+									TP_MST_GOODSKINGDEECODE.GUID,
 									TP_MST_GOODSKINGDEECODE.GOODSCODE,
 									gd.goodsname,
 									TP_MST_GOODSKINGDEECODE.GLAZETYPE,
@@ -1481,16 +1482,16 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 							sre.OtherStatus = -1001;
 							return sre;
 						}
-						sqlString = @"UPDATE TP_MST_GOODSKINGDEECODE
+						sqlString = @" UPDATE TP_MST_GOODSKINGDEECODE
 											SET
 												GOODSCODE=:GOODSCODE,
 												GLAZETYPE = :GLAZETYPE,
 												LOGONAME =:LOGONAME,
 												KINGDEECODE = :KINGDEECODE,
-												UPDATEUSERID =:UPDATEUSERID
+												UPDATEUSERID =:UPDATEUSERID,
 												UPDATETIME = SYSDATE
 											WHERE
-												KINGDEECODE = :KINGDEECODEONE";
+												GUID =:GUID ";
 						paras = new OracleParameter[] {
 					new OracleParameter(":GOODSCODE", cre.Properties["GOODSCODE"].ToString()) ,
 					new OracleParameter(":GLAZETYPE", cre.Properties["GLAZETYPE"].ToString()) ,
@@ -1498,6 +1499,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					new OracleParameter(":KINGDEECODEONE", cre.Properties["KINGDEECODEONE"].ToString()) ,
 					new OracleParameter(":KINGDEECODE", cre.Properties["KINGDEECODE"].ToString()) ,
 					new OracleParameter(":UPDATEUSERID", sUserInfo.UserID) ,
+					new OracleParameter(":GUID", cre.Properties["GUID"].ToString()) ,
 				};
 					}
 				#endregion
@@ -1509,9 +1511,9 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 											SET
 												VALUEFLAG=0
 											WHERE
-												KINGDEECODE = :KINGDEECODEONE";
+												GUID = :GUID";
 					paras = new OracleParameter[] {
-					new OracleParameter(":KINGDEECODEONE", cre.Properties["KINGDEECODEONE"].ToString()) ,
+					new OracleParameter(":GUID", cre.Properties["GUID"].ToString()) ,
 				};
 				}
 					#endregion
@@ -1544,5 +1546,202 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 					}
 				}
 			}
+
+
+		/// <summary>
+		/// 查询模具对应产品
+		/// </summary>
+		/// <param name="sUserInfo"></param>
+		/// <param name="goodsID"></param>
+		/// <returns></returns>
+		public static ServiceResultEntity GetMouldGoodsCode(SUserInfo sUserInfo, ClientRequestEntity cre)
+		{
+			IDBConnection conn = null;
+			try
+			{
+				conn = ClsDbFactory.CreateDBConnection(DataBaseType.ORACLE, DataManager.ConnectionString);
+				OracleParameter[] paras = new OracleParameter[] { };
+				string sqlString = @"
+								SELECT  MOULD.GUID,
+										MOULD.GOODSCODE,
+										GD.GOODSNAME,
+										MOULD.MOULDGOODSCODE,
+										MOULD.MOULDNAME
+										FROM TP_MST_MOULDGOODSCODE MOULD
+										LEFT JOIN TP_MST_GOODS GD ON MOULD.GOODSCODE=GD.GOODSCODE AND GD.VALUEFLAG=1
+										WHERE MOULD.VALUEFLAG=1  ";
+				if (!string.IsNullOrEmpty(cre.Properties["GoodsCode"].ToString()))
+				{
+					sqlString += "AND MOULD.GOODSCODE  like :GOODSCODE";
+				}
+				if (!string.IsNullOrEmpty(cre.Properties["MOULDGOODSCODE"].ToString()))
+				{
+					sqlString += " AND  MOULD.MOULDGOODSCODE like :MOULDGOODSCODE";
+				}
+				if (!string.IsNullOrEmpty(cre.Properties["MOULDNAME"].ToString()))
+				{
+					sqlString += " AND  MOULD.MOULDNAME like :MOULDNAME";
+				}
+				paras = new OracleParameter[]{
+					new OracleParameter(":GOODSCODE",'%'+cre.Properties["GoodsCode"].ToString()+'%'),
+					new OracleParameter(":MOULDNAME",'%'+cre.Properties["MOULDNAME"].ToString()+'%'),
+					new OracleParameter(":MOULDGOODSCODE",'%'+cre.Properties["MOULDGOODSCODE"].ToString()+'%'),
+				};
+				ServiceResultEntity sre = new ServiceResultEntity();
+				sre.Data = conn.GetSqlResultToDs(sqlString, paras);
+				return sre;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+			finally
+			{
+				if (conn != null &&
+					conn.ConnState == ConnectionState.Open)
+				{
+					conn.Close();
+				}
+			}
+		}
+
+
+		///<summary>
+		///保存金蝶代码信息
+		/// </summary>
+		public static ServiceResultEntity AddMouldCode(SUserInfo sUserInfo, ClientRequestEntity cre)
+		{
+			IDBTransaction conn = null;
+			try
+			{
+				conn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+				ServiceResultEntity sre = new ServiceResultEntity();
+				DataTable dt = new DataTable();
+				string sqlString = string.Empty;
+				OracleParameter[] paras = new OracleParameter[] { };
+				//如果版面信息是新建的情况下,是否存在相同版面编码
+				if (cre.Properties["FromStatus"].ToString() == "Add")
+				{
+					sqlString = @"		SELECT 1 FROM TP_MST_MOULDGOODSCODE
+																	WHERE VALUEFLAG=1 
+																		AND	 GOODSCODE= :GOODSCODE
+																		AND  MOULDGOODSCODE= :MOULDGOODSCODE
+																		AND  MOULDNAME= :MOULDNAME";
+
+					paras = new OracleParameter[]{
+					new OracleParameter(":GOODSCODE",cre.Properties["GOODSCODE"].ToString()),
+					new OracleParameter(":MOULDNAME",cre.Properties["MOULDNAME"].ToString()),
+					new OracleParameter(":MOULDGOODSCODE",cre.Properties["MOULDGOODSCODE"].ToString()),
+				};
+					dt = new DataTable();
+					dt = conn.GetSqlResultToDt(sqlString, paras);
+					if (dt != null && dt.Rows.Count > 0)
+					{
+						//存在相同金蝶代码
+						sre.OtherStatus = -1001;
+						return sre;
+					}
+				}
+				#region 新增
+				if (cre.Properties["FromStatus"].ToString() == "Add")
+				{
+					//保存客户信息
+					sqlString = @"INSERT INTO TP_MST_MOULDGOODSCODE(
+										GOODSCODE,
+										MOULDGOODSCODE,
+										MOULDNAME,
+										VALUEFLAG
+										) VALUES(
+										:GOODSCODE,
+										:MOULDGOODSCODE,
+										:MOULDNAME,
+										'1' )";
+					paras = new OracleParameter[]{
+					new OracleParameter(":GOODSCODE",cre.Properties["GOODSCODE"].ToString()),
+					new OracleParameter(":MOULDNAME",cre.Properties["MOULDNAME"].ToString()),
+					new OracleParameter(":MOULDGOODSCODE",cre.Properties["MOULDGOODSCODE"].ToString()),
+						};
+				}
+				#endregion
+				#region 编辑
+				if (cre.Properties["FromStatus"].ToString() == "Edit")
+				{
+					sqlString = @"		SELECT 1 FROM TP_MST_MOULDGOODSCODE
+																	WHERE VALUEFLAG=1 
+																		AND	 GOODSCODE=:GOODSCODE
+																		AND  MOULDGOODSCODE=:MOULDGOODSCODE
+																		AND  MOULDNAME=:MOULDNAME";
+
+					paras = new OracleParameter[]{
+					new OracleParameter(":GOODSCODE",cre.Properties["GOODSCODE"].ToString()),
+					new OracleParameter(":MOULDNAME",cre.Properties["MOULDNAME"].ToString()),
+					new OracleParameter(":MOULDGOODSCODE",cre.Properties["MOULDGOODSCODE"].ToString()),
+						};
+					dt = new DataTable();
+					dt = conn.GetSqlResultToDt(sqlString, paras);
+					if (dt != null && dt.Rows.Count > 0)
+					{
+						//存在相同版面编码
+						sre.OtherStatus = -1001;
+						return sre;
+					}
+					sqlString = @"UPDATE TP_MST_MOULDGOODSCODE
+											SET
+												GOODSCODE=:GOODSCODE,
+												MOULDGOODSCODE =:MOULDGOODSCODE,
+												MOULDNAME =:MOULDNAME
+											WHERE
+												GUID=:GUID";
+					paras = new OracleParameter[]{
+					new OracleParameter(":GOODSCODE",cre.Properties["GOODSCODE"].ToString()),
+					new OracleParameter(":MOULDNAME",cre.Properties["MOULDNAME"].ToString()),
+					new OracleParameter(":MOULDGOODSCODE",cre.Properties["MOULDGOODSCODE"].ToString()),
+					new OracleParameter(":GUID",cre.Properties["GUID"].ToString()),
+						};
+				}
+				#endregion
+
+				#region 删除
+				if (cre.Properties["FromStatus"].ToString() == "Delete")
+				{
+					sqlString = @"UPDATE TP_MST_MOULDGOODSCODE
+											SET
+												VALUEFLAG=0
+											WHERE GUID=:GUID
+												 ";
+					paras = new OracleParameter[]{
+					new OracleParameter(":GUID",cre.Properties["GUID"].ToString()),
+				};
+				}
+				#endregion
+				int result = conn.ExecuteNonQuery(sqlString, paras);
+				if (result <= 0)
+				{
+					//未改变任何数据
+					sre.OtherStatus = -1003;
+					return sre;
+				}
+				else
+				{
+					//提交数据
+					sre.OtherStatus = 1;
+					conn.Commit();
+				}
+
+				return sre;
+			}
+			catch (Exception ex)
+			{
+				throw ex;
+			}
+			finally
+			{
+				if (conn != null &&
+					conn.ConnState == ConnectionState.Open)
+				{
+					conn.Disconnect();
+				}
+			}
+		}
 	}
 }

+ 4 - 0
IBOSS.PRD/F_SYS_0202.cs

@@ -291,6 +291,10 @@ namespace Dongke.IBOSS.PRD.Client
 									//系统管理-产品信息-金蝶代码对应
 									ShowInDockPanel(F_MST_1301.Instance);
 									break;
+								case "010311":
+									//系统管理-产品信息-模具产品对应
+									ShowInDockPanel(F_MST_1401.Instance);
+									break;
 								#endregion
 
 								#region 系统管理-HR基础数据

+ 19 - 1
WCF.Service/WCF.Services/SystemModuleService.cs

@@ -2693,7 +2693,25 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                     }
                     return null;
                 }
-
+                if ("F_MST_1401" == cre.NameSpace)
+                {
+                   
+                    if ("GetMouldGoodsCode" == cre.Name)
+                    {
+                        ServiceResultEntity result =
+                           ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                           () => SystemModuleLogic.GetMouldGoodsCode(SUserInfo, cre));
+                        return result;
+                    }
+                    if ("AddMouldCode" == cre.Name)
+                    {
+                        ServiceResultEntity result =
+                           ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                           () => SystemModuleLogic.AddMouldCode(SUserInfo, cre));
+                        return result;
+                    }
+                    return null;
+                }
                 return null;
             }
             catch (Exception ex)