订单信息修改

DK.Client/SystemModule/F_MST_1601.Designer.cs

@@ -36,12 +36,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
 			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-			System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = 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();
@@ -58,17 +58,20 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label3 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.txtOrdersCode = new System.Windows.Forms.TextBox();
 			this.c_Label2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtLayoutCode = new System.Windows.Forms.TextBox();
-			this.c_Label1 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-			this.txtCustomerCode = new System.Windows.Forms.TextBox();
 			this.btnClearCondition = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
 			this.btnSearch = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Button();
-			this.lblEntruckingCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dgvOrder = new System.Windows.Forms.TabControl();
 			this.tabPage1 = new System.Windows.Forms.TabPage();
 			this.dgvRpt = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
 			this.tabPage2 = new System.Windows.Forms.TabPage();
 			this.dgvRpt2 = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+			this.ORDERSDETAILID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ORDERSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.CUSTOMERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.LAYOUTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.PRODUCTMODEL = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.BARCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.ENTRUCKINGCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.ORDERSCODES = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.f_num = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.g1goodscode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -76,12 +79,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.GOODSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.g_num = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.VALUEFLAG = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ORDERSDETAILID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.ORDERSCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.CUSTOMERNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.LAYOUTNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.PRODUCTMODEL = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.BARCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.tsrOperate.SuspendLayout();
 			this.gbxCondition.SuspendLayout();
 			this.dgvOrder.SuspendLayout();
@@ -174,12 +171,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.gbxCondition.Controls.Add(this.c_Label3);
 			this.gbxCondition.Controls.Add(this.txtOrdersCode);
 			this.gbxCondition.Controls.Add(this.c_Label2);
-			this.gbxCondition.Controls.Add(this.txtLayoutCode);
-			this.gbxCondition.Controls.Add(this.c_Label1);
-			this.gbxCondition.Controls.Add(this.txtCustomerCode);
 			this.gbxCondition.Controls.Add(this.btnClearCondition);
 			this.gbxCondition.Controls.Add(this.btnSearch);
-			this.gbxCondition.Controls.Add(this.lblEntruckingCode);
 			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;
@@ -197,7 +190,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.cbflagfalse.Checked = true;
 			this.cbflagfalse.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.cbflagfalse.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.cbflagfalse.Location = new System.Drawing.Point(989, 23);
+			this.cbflagfalse.Location = new System.Drawing.Point(607, 28);
 			this.cbflagfalse.Name = "cbflagfalse";
 			this.cbflagfalse.Size = new System.Drawing.Size(36, 16);
 			this.cbflagfalse.TabIndex = 43;
@@ -210,7 +203,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.cbflagtrue.Checked = true;
 			this.cbflagtrue.CheckState = System.Windows.Forms.CheckState.Checked;
 			this.cbflagtrue.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.cbflagtrue.Location = new System.Drawing.Point(953, 23);
+			this.cbflagtrue.Location = new System.Drawing.Point(565, 29);
 			this.cbflagtrue.Name = "cbflagtrue";
 			this.cbflagtrue.Size = new System.Drawing.Size(36, 16);
 			this.cbflagtrue.TabIndex = 42;
@@ -222,7 +215,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtProductModel.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtProductModel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtProductModel.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtProductModel.Location = new System.Drawing.Point(784, 21);
+			this.txtProductModel.Location = new System.Drawing.Point(403, 26);
 			this.txtProductModel.MaxLength = 20;
 			this.txtProductModel.Name = "txtProductModel";
 			this.txtProductModel.Size = new System.Drawing.Size(97, 21);
@@ -234,7 +227,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			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.SystemColors.ControlText;
-			this.c_Label5.Location = new System.Drawing.Point(897, 25);
+			this.c_Label5.Location = new System.Drawing.Point(506, 32);
 			this.c_Label5.Name = "c_Label5";
 			this.c_Label5.Size = new System.Drawing.Size(53, 12);
 			this.c_Label5.TabIndex = 41;
@@ -246,7 +239,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			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.SystemColors.ControlText;
-			this.c_Label4.Location = new System.Drawing.Point(725, 25);
+			this.c_Label4.Location = new System.Drawing.Point(344, 30);
 			this.c_Label4.Name = "c_Label4";
 			this.c_Label4.Size = new System.Drawing.Size(53, 12);
 			this.c_Label4.TabIndex = 17;
@@ -257,7 +250,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtOrdersName.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtOrdersName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtOrdersName.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtOrdersName.Location = new System.Drawing.Point(603, 21);
+			this.txtOrdersName.Location = new System.Drawing.Point(230, 25);
 			this.txtOrdersName.MaxLength = 20;
 			this.txtOrdersName.Name = "txtOrdersName";
 			this.txtOrdersName.Size = new System.Drawing.Size(97, 21);
@@ -269,7 +262,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label3.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label3.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label3.Location = new System.Drawing.Point(544, 25);
+			this.c_Label3.Location = new System.Drawing.Point(171, 30);
 			this.c_Label3.Name = "c_Label3";
 			this.c_Label3.Size = new System.Drawing.Size(53, 12);
 			this.c_Label3.TabIndex = 15;
@@ -280,7 +273,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtOrdersCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtOrdersCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.txtOrdersCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtOrdersCode.Location = new System.Drawing.Point(418, 21);
+			this.txtOrdersCode.Location = new System.Drawing.Point(53, 23);
 			this.txtOrdersCode.MaxLength = 20;
 			this.txtOrdersCode.Name = "txtOrdersCode";
 			this.txtOrdersCode.Size = new System.Drawing.Size(97, 21);
@@ -292,46 +285,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label2.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label2.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label2.Location = new System.Drawing.Point(359, 25);
+			this.c_Label2.Location = new System.Drawing.Point(6, 30);
 			this.c_Label2.Name = "c_Label2";
 			this.c_Label2.Size = new System.Drawing.Size(41, 12);
 			this.c_Label2.TabIndex = 13;
 			this.c_Label2.Text = "订单号";
 			// 
-			// txtLayoutCode
-			// 
-			this.txtLayoutCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtLayoutCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtLayoutCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtLayoutCode.Location = new System.Drawing.Point(241, 20);
-			this.txtLayoutCode.MaxLength = 20;
-			this.txtLayoutCode.Name = "txtLayoutCode";
-			this.txtLayoutCode.Size = new System.Drawing.Size(97, 21);
-			this.txtLayoutCode.TabIndex = 12;
-			// 
-			// c_Label1
-			// 
-			this.c_Label1.AutoSize = true;
-			this.c_Label1.BackColor = System.Drawing.Color.Transparent;
-			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.c_Label1.Location = new System.Drawing.Point(182, 24);
-			this.c_Label1.Name = "c_Label1";
-			this.c_Label1.Size = new System.Drawing.Size(53, 12);
-			this.c_Label1.TabIndex = 11;
-			this.c_Label1.Text = "版面编码";
-			// 
-			// txtCustomerCode
-			// 
-			this.txtCustomerCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
-			this.txtCustomerCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtCustomerCode.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtCustomerCode.Location = new System.Drawing.Point(70, 20);
-			this.txtCustomerCode.MaxLength = 20;
-			this.txtCustomerCode.Name = "txtCustomerCode";
-			this.txtCustomerCode.Size = new System.Drawing.Size(97, 21);
-			this.txtCustomerCode.TabIndex = 2;
-			// 
 			// btnClearCondition
 			// 
 			this.btnClearCondition.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -364,18 +323,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.btnSearch.UseVisualStyleBackColor = false;
 			this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
 			// 
-			// lblEntruckingCode
-			// 
-			this.lblEntruckingCode.AutoSize = true;
-			this.lblEntruckingCode.BackColor = System.Drawing.Color.Transparent;
-			this.lblEntruckingCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.lblEntruckingCode.ForeColor = System.Drawing.SystemColors.ControlText;
-			this.lblEntruckingCode.Location = new System.Drawing.Point(11, 24);
-			this.lblEntruckingCode.Name = "lblEntruckingCode";
-			this.lblEntruckingCode.Size = new System.Drawing.Size(53, 12);
-			this.lblEntruckingCode.TabIndex = 1;
-			this.lblEntruckingCode.Text = "客户编码";
-			// 
 			// dgvOrder
 			// 
 			this.dgvOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -511,7 +458,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
             this.CUSTOMERNAME,
             this.LAYOUTNAME,
             this.PRODUCTMODEL,
-            this.BARCODE});
+            this.BARCODE,
+            this.ENTRUCKINGCODE});
 			this.dgvRpt2.ColumnTreeView = null;
 			this.dgvRpt2.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.dgvRpt2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -549,6 +497,62 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.dgvRpt2.ViewRowFilter = "";
 			this.dgvRpt2.ColumnStateChanged += new System.Windows.Forms.DataGridViewColumnStateChangedEventHandler(this.dgvRpt2_ColumnStateChanged);
 			// 
+			// ORDERSDETAILID
+			// 
+			this.ORDERSDETAILID.DataPropertyName = "ORDERSDETAILID";
+			this.ORDERSDETAILID.HeaderText = "订单详细id";
+			this.ORDERSDETAILID.Name = "ORDERSDETAILID";
+			this.ORDERSDETAILID.ReadOnly = true;
+			this.ORDERSDETAILID.Visible = false;
+			// 
+			// ORDERSCODE
+			// 
+			this.ORDERSCODE.DataPropertyName = "ORDERSCODE";
+			this.ORDERSCODE.HeaderText = "订单号";
+			this.ORDERSCODE.Name = "ORDERSCODE";
+			this.ORDERSCODE.ReadOnly = true;
+			// 
+			// CUSTOMERNAME
+			// 
+			this.CUSTOMERNAME.DataPropertyName = "CUSTOMERNAME";
+			this.CUSTOMERNAME.HeaderText = "客户名称";
+			this.CUSTOMERNAME.Name = "CUSTOMERNAME";
+			this.CUSTOMERNAME.ReadOnly = true;
+			// 
+			// LAYOUTNAME
+			// 
+			this.LAYOUTNAME.DataPropertyName = "LAYOUTNAME";
+			this.LAYOUTNAME.HeaderText = "版面名称";
+			this.LAYOUTNAME.Name = "LAYOUTNAME";
+			this.LAYOUTNAME.ReadOnly = true;
+			// 
+			// PRODUCTMODEL
+			// 
+			this.PRODUCTMODEL.DataPropertyName = "GOODSCODE";
+			dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle10.Format = "N0";
+			this.PRODUCTMODEL.DefaultCellStyle = dataGridViewCellStyle10;
+			this.PRODUCTMODEL.HeaderText = "产品型号";
+			this.PRODUCTMODEL.Name = "PRODUCTMODEL";
+			this.PRODUCTMODEL.ReadOnly = true;
+			// 
+			// BARCODE
+			// 
+			this.BARCODE.DataPropertyName = "BARCODE";
+			dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+			dataGridViewCellStyle11.Format = "N0";
+			this.BARCODE.DefaultCellStyle = dataGridViewCellStyle11;
+			this.BARCODE.HeaderText = "产品条码";
+			this.BARCODE.Name = "BARCODE";
+			this.BARCODE.ReadOnly = true;
+			// 
+			// ENTRUCKINGCODE
+			// 
+			this.ENTRUCKINGCODE.DataPropertyName = "ENTRUCKINGCODE";
+			this.ENTRUCKINGCODE.HeaderText = "载具条码";
+			this.ENTRUCKINGCODE.Name = "ENTRUCKINGCODE";
+			this.ENTRUCKINGCODE.ReadOnly = true;
+			// 
 			// ORDERSCODES
 			// 
 			this.ORDERSCODES.DataPropertyName = "ORDERSCODE";
@@ -575,6 +579,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.g1goodscode.HeaderText = "客户编码";
 			this.g1goodscode.Name = "g1goodscode";
 			this.g1goodscode.ReadOnly = true;
+			this.g1goodscode.Visible = false;
 			// 
 			// d_num
 			// 
@@ -585,6 +590,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.d_num.HeaderText = "版面编码";
 			this.d_num.Name = "d_num";
 			this.d_num.ReadOnly = true;
+			this.d_num.Visible = false;
 			// 
 			// GOODSCODE
 			// 
@@ -611,55 +617,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.VALUEFLAG.Name = "VALUEFLAG";
 			this.VALUEFLAG.ReadOnly = true;
 			// 
-			// ORDERSDETAILID
-			// 
-			this.ORDERSDETAILID.DataPropertyName = "ORDERSDETAILID";
-			this.ORDERSDETAILID.HeaderText = "订单详细id";
-			this.ORDERSDETAILID.Name = "ORDERSDETAILID";
-			this.ORDERSDETAILID.ReadOnly = true;
-			this.ORDERSDETAILID.Visible = false;
-			// 
-			// ORDERSCODE
-			// 
-			this.ORDERSCODE.DataPropertyName = "ORDERSCODE";
-			this.ORDERSCODE.HeaderText = "订单号";
-			this.ORDERSCODE.Name = "ORDERSCODE";
-			this.ORDERSCODE.ReadOnly = true;
-			// 
-			// CUSTOMERNAME
-			// 
-			this.CUSTOMERNAME.DataPropertyName = "CUSTOMERNAME";
-			this.CUSTOMERNAME.HeaderText = "客户名称";
-			this.CUSTOMERNAME.Name = "CUSTOMERNAME";
-			this.CUSTOMERNAME.ReadOnly = true;
-			// 
-			// LAYOUTNAME
-			// 
-			this.LAYOUTNAME.DataPropertyName = "LAYOUTNAME";
-			this.LAYOUTNAME.HeaderText = "版面名称";
-			this.LAYOUTNAME.Name = "LAYOUTNAME";
-			this.LAYOUTNAME.ReadOnly = true;
-			// 
-			// PRODUCTMODEL
-			// 
-			this.PRODUCTMODEL.DataPropertyName = "GOODSCODE";
-			dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle10.Format = "N0";
-			this.PRODUCTMODEL.DefaultCellStyle = dataGridViewCellStyle10;
-			this.PRODUCTMODEL.HeaderText = "产品型号";
-			this.PRODUCTMODEL.Name = "PRODUCTMODEL";
-			this.PRODUCTMODEL.ReadOnly = true;
-			// 
-			// BARCODE
-			// 
-			this.BARCODE.DataPropertyName = "BARCODE";
-			dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-			dataGridViewCellStyle11.Format = "N0";
-			this.BARCODE.DefaultCellStyle = dataGridViewCellStyle11;
-			this.BARCODE.HeaderText = "产品条码";
-			this.BARCODE.Name = "BARCODE";
-			this.BARCODE.ReadOnly = true;
-			// 
 			// F_MST_1601
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -694,12 +651,8 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private System.Windows.Forms.ToolStripButton tsbtnAdaptive;
 		private System.Windows.Forms.ToolStripButton tsbtnClose;
 		private Basics.BaseControls.C_GroupBox gbxCondition;
-		private System.Windows.Forms.TextBox txtCustomerCode;
 		private Basics.BaseControls.C_Button btnClearCondition;
 		private Basics.BaseControls.C_Button btnSearch;
-		private Basics.BaseControls.C_Label lblEntruckingCode;
-		private System.Windows.Forms.TextBox txtLayoutCode;
-		private Basics.BaseControls.C_Label c_Label1;
 		private System.Windows.Forms.TextBox txtOrdersName;
 		private Basics.BaseControls.C_Label c_Label3;
 		private System.Windows.Forms.TextBox txtOrdersCode;
@@ -714,6 +667,13 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private Basics.BaseControls.C_CheckBox cbflagfalse;
 		private Basics.BaseControls.C_CheckBox cbflagtrue;
 		private Basics.BaseControls.C_Label c_Label5;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ORDERSDETAILID;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ORDERSCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn CUSTOMERNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn LAYOUTNAME;
+		private System.Windows.Forms.DataGridViewTextBoxColumn PRODUCTMODEL;
+		private System.Windows.Forms.DataGridViewTextBoxColumn BARCODE;
+		private System.Windows.Forms.DataGridViewTextBoxColumn ENTRUCKINGCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ORDERSCODES;
 		private System.Windows.Forms.DataGridViewTextBoxColumn f_num;
 		private System.Windows.Forms.DataGridViewTextBoxColumn g1goodscode;
@@ -721,11 +681,5 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		private System.Windows.Forms.DataGridViewTextBoxColumn GOODSCODE;
 		private System.Windows.Forms.DataGridViewTextBoxColumn g_num;
 		private System.Windows.Forms.DataGridViewTextBoxColumn VALUEFLAG;
-		private System.Windows.Forms.DataGridViewTextBoxColumn ORDERSDETAILID;
-		private System.Windows.Forms.DataGridViewTextBoxColumn ORDERSCODE;
-		private System.Windows.Forms.DataGridViewTextBoxColumn CUSTOMERNAME;
-		private System.Windows.Forms.DataGridViewTextBoxColumn LAYOUTNAME;
-		private System.Windows.Forms.DataGridViewTextBoxColumn PRODUCTMODEL;
-		private System.Windows.Forms.DataGridViewTextBoxColumn BARCODE;
 	}
 }

DK.Client/SystemModule/F_MST_1601.cs

@@ -98,8 +98,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 					ClientRequestEntity cre = new ClientRequestEntity();
 					cre.NameSpace = "F_MST_1601";
 					cre.Name = "GetOrder";
-					cre.Properties["CUSTOMERCODE"] = txtCustomerCode.Text;
-					cre.Properties["LAYOUTCODE"] = txtLayoutCode.Text;
 					cre.Properties["ORDERSCODE"] = txtOrdersCode.Text;
 					cre.Properties["ORDERSNAME"] = txtOrdersName.Text;
 					cre.Properties["GOODSCODE"] = txtProductModel.Text;
@@ -310,8 +308,6 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				ClientRequestEntity cre = new ClientRequestEntity();
 				cre.NameSpace = "F_MST_1601";
 				cre.Name = "GetCustomer";
-				cre.Properties["CUSTOMERCODE"] = txtCustomerCode.Text;
-				cre.Properties["CUSTOMERNAME"] = txtLayoutCode.Text;
 				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 				if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
 				{

DK.Client/SystemModule/F_MST_1601.resx

@@ -227,4 +227,7 @@
   <metadata name="BARCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="ENTRUCKINGCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

DK.Client/SystemModule/F_MST_1602.Designer.cs

@@ -53,7 +53,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.ccbvalueflag.Items.AddRange(new object[] {
             "有效",
             "无效"});
-			this.ccbvalueflag.Location = new System.Drawing.Point(74, 93);
+			this.ccbvalueflag.Location = new System.Drawing.Point(74, 57);
 			this.ccbvalueflag.Name = "ccbvalueflag";
 			this.ccbvalueflag.Size = new System.Drawing.Size(133, 20);
 			this.ccbvalueflag.TabIndex = 61;
@@ -64,7 +64,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label6.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label6.ForeColor = System.Drawing.Color.Red;
-			this.c_Label6.Location = new System.Drawing.Point(18, 96);
+			this.c_Label6.Location = new System.Drawing.Point(18, 60);
 			this.c_Label6.Name = "c_Label6";
 			this.c_Label6.Size = new System.Drawing.Size(53, 12);
 			this.c_Label6.TabIndex = 62;
@@ -104,7 +104,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label2.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label2.ForeColor = System.Drawing.Color.Red;
-			this.c_Label2.Location = new System.Drawing.Point(255, 96);
+			this.c_Label2.Location = new System.Drawing.Point(255, 60);
 			this.c_Label2.Name = "c_Label2";
 			this.c_Label2.Size = new System.Drawing.Size(29, 12);
 			this.c_Label2.TabIndex = 54;
@@ -118,7 +118,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtNumbers.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtNumbers.ErrorMessage = "";
 			this.txtNumbers.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtNumbers.Location = new System.Drawing.Point(290, 93);
+			this.txtNumbers.Location = new System.Drawing.Point(290, 57);
 			this.txtNumbers.MaxLength = 20;
 			this.txtNumbers.Name = "txtNumbers";
 			this.txtNumbers.Size = new System.Drawing.Size(130, 21);
@@ -183,7 +183,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtLayoutCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtLayoutCode.ErrorMessage = "";
 			this.txtLayoutCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtLayoutCode.Location = new System.Drawing.Point(290, 56);
+			this.txtLayoutCode.Location = new System.Drawing.Point(290, 96);
 			this.txtLayoutCode.MaxLength = 20;
 			this.txtLayoutCode.Name = "txtLayoutCode";
 			this.txtLayoutCode.Size = new System.Drawing.Size(130, 21);
@@ -195,7 +195,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.c_Label1.BackColor = System.Drawing.Color.Transparent;
 			this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.c_Label1.ForeColor = System.Drawing.Color.Red;
-			this.c_Label1.Location = new System.Drawing.Point(231, 60);
+			this.c_Label1.Location = new System.Drawing.Point(231, 99);
 			this.c_Label1.Name = "c_Label1";
 			this.c_Label1.Size = new System.Drawing.Size(53, 12);
 			this.c_Label1.TabIndex = 43;
@@ -209,11 +209,12 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.txtCustomerCode.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
 			this.txtCustomerCode.ErrorMessage = "";
 			this.txtCustomerCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.txtCustomerCode.Location = new System.Drawing.Point(77, 56);
+			this.txtCustomerCode.Location = new System.Drawing.Point(77, 93);
 			this.txtCustomerCode.MaxLength = 20;
 			this.txtCustomerCode.Name = "txtCustomerCode";
 			this.txtCustomerCode.Size = new System.Drawing.Size(130, 21);
 			this.txtCustomerCode.TabIndex = 42;
+			this.txtCustomerCode.TextChanged += new System.EventHandler(this.txtCustomerCode_TextChanged);
 			// 
 			// lblMAC
 			// 
@@ -221,12 +222,13 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 			this.lblMAC.BackColor = System.Drawing.Color.Transparent;
 			this.lblMAC.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.lblMAC.ForeColor = System.Drawing.Color.Red;
-			this.lblMAC.Location = new System.Drawing.Point(18, 60);
+			this.lblMAC.Location = new System.Drawing.Point(18, 99);
 			this.lblMAC.Name = "lblMAC";
 			this.lblMAC.Size = new System.Drawing.Size(53, 12);
 			this.lblMAC.TabIndex = 41;
 			this.lblMAC.Text = "客户编码";
 			this.lblMAC.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.lblMAC.Click += new System.EventHandler(this.lblMAC_Click);
 			// 
 			// F_MST_1602
 			// 

DK.Client/SystemModule/F_MST_1602.cs

@@ -46,31 +46,32 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				string OrderCode = arrayList[0].ToString();
 				if (!string.IsNullOrEmpty(OrderCode))
 				{
-					if (Order == 1)
+					this.txtNumbers.Visible = true;
+					this.c_Label2.Visible = true;
+					OrderCodeOne = OrderCode;
+					ClientRequestEntity cre = new ClientRequestEntity();
+					cre.NameSpace = "F_MST_1601";
+					if (OrderCode == "2")
+					{
+						cre.Name = "GetOrderDetails";
+					}
+					else
 					{
-						this.txtNumbers.Visible = true;
-						this.c_Label2.Visible = true;
-						OrderCodeOne = OrderCode;
-						ClientRequestEntity cre = new ClientRequestEntity();
-						cre.NameSpace = "F_MST_1601";
 						cre.Name = "GetOrder";
-						cre.Properties["ORDERSCODE"] = OrderCode;
-						cre.Properties["LAYOUTCODE"] = "";
-						cre.Properties["CUSTOMERCODE"] = "";
-						cre.Properties["GOODSCODE"] = "";
-						cre.Properties["ORDERSNAME"] = "";
-						cre.Properties["VALUEFLAG"] = "";
-						ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
-						if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+					}
+					cre.Properties["ORDERSCODE"] = OrderCode;
+					cre.Properties["GOODSCODE"] = "";
+					cre.Properties["ORDERSNAME"] = "";
+					cre.Properties["VALUEFLAG"] = "";
+					ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+					if (sre.Status == Basics.BaseResources.Constant.ServiceResultStatus.Success)
+					{
+						if (sre.Data.Tables[0] != null && sre.Data.Tables[0].Rows.Count > 0)
 						{
 							//订单号
 							this.txtOrderCode.Text = OrderCode;
-							////客户编码
-							this.txtCustomerCode.Text = sre.Data.Tables[0].Rows[0]["CUSTOMERCODE"].ToString();
 							////订单名称
 							this.txtOrderName.Text = sre.Data.Tables[0].Rows[0]["ORDERSNAME"].ToString();
-							//版面名称
-							this.txtLayoutCode.Text = sre.Data.Tables[0].Rows[0]["LAYOUTCODE"].ToString();
 							//数量
 							this.txtNumbers.Text = sre.Data.Tables[0].Rows[0]["NUMBERS"].ToString();
 							//有效标识
@@ -84,25 +85,26 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 							}
 							////备注
 							//this.txtRemarks.Text = sre.Data.Tables[0].Rows[0]["REMARKS"].ToString();
+							if (Order == 2)
+							{
+								this.txtOrderName.Enabled = false;
+								this.txtNumbers.Enabled = false;
+								this.txtNumbers.Text = sre.Data.Tables[0].Rows[0]["NUMBERS"].ToString();
+								this.txtNumbers.Text = sre.Data.Tables[0].Rows[0]["NUMBERS"].ToString();
+							}
+							else
+							{
+								txtCustomerCode.Visible = false;
+								lblMAC.Visible = false;
+								c_Label1.Visible = false;
+								txtLayoutCode.Visible = false;
+							}
 						}
-					}
-					else if (Order == 2)
-					{
-						this.txtOrderCode.Text = OrderCode;
-						this.txtOrderCode.Enabled = true;
-						this.txtOrderName.Enabled = true;
-						this.txtLayoutCode.Enabled = true;
-						this.txtCustomerCode.Enabled = true;
-						this.txtNumbers.Visible = false;
-						this.c_Label2.Visible = false;
-						//有效标识
-						if (arrayList1[3].ToString() == "是")
-						{
-							this.ccbvalueflag.SelectedIndex = 0;
-						}
-						else if (arrayList1[3].ToString() == "否")
+						else
 						{
-							this.ccbvalueflag.SelectedIndex = 1;
+							// 提示未查找到数据
+							MessageBox.Show(Messages.MSG_CMN_I002, this.Text,
+								MessageBoxButtons.OK, MessageBoxIcon.Information);
 						}
 					}
 				}
@@ -134,7 +136,7 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		{
 			try
 			{
-				if (Orders != 2)
+				if (Orders == 2)
 				{
 					//客户编码
 					if (string.IsNullOrEmpty(this.txtCustomerCode.Text.ToString()))
@@ -281,7 +283,11 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				cre.Properties["VALUEFLAG"] = valueflag;
 				cre.Properties["FromStatus"] = FromStatus.ToString();
 				cre.Properties["ORDERS"] = Orders;
-				cre.Properties["ORDERSDETAILID"] = arrayList1[4].ToString();
+				cre.Properties["ORDERSDETAILID"] = arrayList1[2].ToString();
+				cre.Properties["ORDERSNAME"] = this.txtOrderName.Text;
+				cre.Properties["ORDERSCODE"] = this.txtOrderCode.Text;
+				cre.Properties["CUSTOMERCODE"] = this.txtCustomerCode.Text;
+				cre.Properties["LAYOUTCODE"] = this.txtLayoutCode.Text;
 				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 				this.btnSave.Enabled = true;
 				this.btnCancel.Enabled = true;
@@ -308,11 +314,9 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 				cre.Properties["VALUEFALG"] = valueflag;
 				cre.Properties["FromStatus"] = FromStatus.ToString();
 				cre.Properties["ORDERS"] = Orders;
-				cre.Properties["ORDERCODE"] = this.txtOrderCode.Text;
+				cre.Properties["ORDERSCODE"] = this.txtOrderCode.Text;
 				cre.Properties["ORDERCODEONE"] = OrderCodeOne;
-				cre.Properties["CUSTOMERCODE"] = this.txtCustomerCode.Text;
 				cre.Properties["ORDERNAME"] = this.txtOrderName.Text;
-				cre.Properties["LAYOUTCODE"] = this.txtLayoutCode.Text;
 				cre.Properties["NUMBERS"] = this.txtNumbers.Text;
 				ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
 				this.btnSave.Enabled = true;
@@ -341,5 +345,15 @@ namespace Dongke.IBOSS.PRD.Client.SystemModule
 		{
 
 		}
+
+		private void txtCustomerCode_TextChanged(object sender, EventArgs e)
+		{
+
+		}
+
+		private void lblMAC_Click(object sender, EventArgs e)
+		{
+
+		}
 	}
 }

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -1993,8 +1993,6 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 
 				string sqlString = @"
 										SELECT
-											CUSTOMERCODE,
-											LAYOUTCODE,
 											ORDERSCODE,
 											ORDERSNAME,
 											GOODSCODE,
@@ -2007,14 +2005,6 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 											TP_PC_ORDERINFORMATION 
 										WHERE
 											1 = 1";
-				if (!string.IsNullOrEmpty(cre.Properties["LAYOUTCODE"].ToString()))
-				{
-					sqlString += " AND LAYOUTCODE like : LAYOUTCODE";
-				}
-				if (!string.IsNullOrEmpty(cre.Properties["CUSTOMERCODE"].ToString()))
-				{
-					sqlString += " AND CUSTOMERCODE like : CUSTOMERCODE";
-				}
 				if (!string.IsNullOrEmpty(cre.Properties["ORDERSCODE"].ToString()))
 				{
 					sqlString += " AND ORDERSCODE like : ORDERSCODE";
@@ -2033,8 +2023,6 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 				}
 
 				OracleParameter[] paras = new OracleParameter[]{
-					new OracleParameter(":LAYOUTCODE",'%'+cre.Properties["LAYOUTCODE"].ToString()+'%'),
-					new OracleParameter(":CUSTOMERCODE",'%'+cre.Properties["CUSTOMERCODE"].ToString()+'%'),
 					new OracleParameter(":ORDERSCODE",'%'+cre.Properties["ORDERSCODE"].ToString()+'%'),
 					new OracleParameter(":ORDERSNAME",'%'+cre.Properties["ORDERSNAME"].ToString()+'%'),
 					new OracleParameter(":GOODSCODE",'%'+cre.Properties["GOODSCODE"].ToString()+'%'),
@@ -2069,29 +2057,38 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 
 				string sqlString = @"
 										SELECT 
-											ORDERSDETAILID,
-											ORDERSCODE,
-											GOODSCODE,
-											BARCODE,
+											S.ORDERSDETAILID,
+											S.ORDERSCODE,
+											S.GOODSCODE,
+											S.BARCODE,
+											S.	LAYOUTCODE,
+											l.	LAYOUTNAME,
+											S.	CUSTOMERCODE,
+											c.	CUSTOMERNAME,
 											CASE
-											WHEN VALUEFLAG = 1 THEN
+											WHEN S.VALUEFLAG = 1 THEN
 												'是' ELSE '否'
-											END AS VALUEFLAGT
+											END AS VALUEFLAGT,
+											E.ENTRUCKINGCODE
 										FROM
-											TP_PC_ORDERINFORMATIONDETAILS 
+											TP_PC_ORDERINFORMATIONDETAILS  S
+											LEFT JOIN TP_PM_ENTRUCKINGDETAIL E ON S.BARCODE = E.BARCODE 
+											LEFT JOIN TP_PC_CUSTOMERINFORMATION c ON S.CUSTOMERCODE = c.CUSTOMERCODE 
+											LEFT JOIN TP_PC_LAYOUTINFORMATION l ON S.LAYOUTCODE = l.LAYOUTCODE 
+											AND		  E.DoFunction IN (1,3)
 										WHERE
 											1 =1";
 				if (!string.IsNullOrEmpty(cre.Properties["ORDERCODE"].ToString()))
 				{
-					sqlString += " AND ORDERSCODE like : ORDERSCODE";
+					sqlString += " AND S.ORDERSCODE like : ORDERSCODE";
 				}
 				if (!string.IsNullOrEmpty(cre.Properties["GOODSCODE"].ToString()))
 				{
-					sqlString += " AND GOODSCODE like : GOODSCODE";
+					sqlString += " AND S.GOODSCODE like : GOODSCODE";
 				}
 				if (!string.IsNullOrEmpty(cre.Properties["VALUEFLAG"].ToString()))
 				{
-					sqlString += " AND VALUEFLAG = : VALUEFLAG";
+					sqlString += " AND S.VALUEFLAG = : VALUEFLAG";
 				}
 
 				OracleParameter[] paras = new OracleParameter[]{
@@ -2191,7 +2188,7 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 											SELECT 1 FROM TP_PC_ORDERINFORMATION WHERE ORDERSCODE = :ORDERSCODE AND ORDERSCODE != :ORDERCODEONE";
 
 						paras = new OracleParameter[] { 
-							new OracleParameter(":ORDERSCODE", cre.Properties["ORDERCODE"].ToString()), 
+							new OracleParameter(":ORDERSCODE", cre.Properties["ORDERSCODE"].ToString()), 
 							new OracleParameter(":ORDERCODEONE", cre.Properties["ORDERCODEONE"].ToString()),
 						};
 						dt = new DataTable();
@@ -2204,32 +2201,36 @@ namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic
 						}
 						sqlString = @"UPDATE TP_PC_ORDERINFORMATION
 											SET
-												CUSTOMERCODE=:CUSTOMERCODE,
-												LAYOUTCODE = :LAYOUTCODE,
-												ORDERSNAME =:ORDERSNAME,
+												ORDERSNAME =:ORDERNAME,
+												ORDERSCODE =:ORDERSCODE,
 												NUMBERS = :NUMBERS,
-												VALUEFLAG = :VALUEFLAG
+												VALUEFLAG = :VALUEFALG
 											WHERE
-												ORDERSCODE = :ORDERSCODEONE";
+												ORDERSCODE = :ORDERCODEONE";
 						paras = new OracleParameter[] {
-					new OracleParameter(":CUSTOMERCODE", cre.Properties["CUSTOMERCODE"].ToString()) ,
-					new OracleParameter(":LAYOUTCODE", cre.Properties["LAYOUTCODE"].ToString()) ,
-					new OracleParameter(":ORDERSCODEONE", cre.Properties["ORDERCODEONE"].ToString()) ,
-					new OracleParameter(":ORDERSNAME", cre.Properties["ORDERNAME"].ToString()) ,
+					new OracleParameter(":ORDERCODEONE", cre.Properties["ORDERCODEONE"].ToString()) ,
+					new OracleParameter(":ORDERNAME", cre.Properties["ORDERNAME"].ToString()) ,
+					new OracleParameter(":ORDERSCODE", cre.Properties["ORDERSCODE"].ToString()) ,
 					new OracleParameter(":NUMBERS", cre.Properties["NUMBERS"].ToString()) ,
-					new OracleParameter(":VALUEFLAG", cre.Properties["VALUEFALG"].ToString()) ,
+					new OracleParameter(":VALUEFALG", cre.Properties["VALUEFALG"].ToString()) ,
 				};
 					}
 					else if (cre.Properties["ORDERS"].ToString() == "2")
 					{
 						sqlString = @"UPDATE TP_PC_ORDERINFORMATIONDETAILS
 											SET
+												CUSTOMERCODE=:CUSTOMERCODE,
+												LAYOUTCODE = :LAYOUTCODE,
+												ORDERSCODE = :ORDERSCODE,
 												VALUEFLAG = :VALUEFLAG
 											WHERE
 												ORDERSDETAILID = :ORDERSDETAILID";
 						paras = new OracleParameter[] {
-					new OracleParameter(":ORDERSDETAILID", cre.Properties["ORDERSDETAILID"].ToString()) ,
+					new OracleParameter(":ORDERSDETAILID", Convert.ToInt32( cre.Properties["ORDERSDETAILID"])) ,
 					new OracleParameter(":VALUEFLAG", cre.Properties["VALUEFLAG"].ToString()) ,
+					new OracleParameter(":CUSTOMERCODE", cre.Properties["CUSTOMERCODE"].ToString()) ,
+					new OracleParameter(":LAYOUTCODE", cre.Properties["LAYOUTCODE"].ToString()) ,
+					new OracleParameter(":ORDERSCODE", cre.Properties["ORDERSCODE"].ToString()) ,
 				};
 					}
 				}