工单关联信息查询界面调整

UAS-MES/FunctionCode/Query/Query_MakeInf.Designer.cs

@@ -144,9 +144,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(45, 9);
+            this.label1.Location = new System.Drawing.Point(34, 7);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(72, 27);
+            this.label1.Size = new System.Drawing.Size(58, 21);
             this.label1.TabIndex = 0;
             this.label1.Text = "工单号";
             // 
@@ -155,10 +156,11 @@
             this.MakeCode.AllPower = null;
             this.MakeCode.BackColor = System.Drawing.Color.White;
             this.MakeCode.ID = null;
-            this.MakeCode.Location = new System.Drawing.Point(130, 11);
+            this.MakeCode.Location = new System.Drawing.Point(98, 9);
+            this.MakeCode.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MakeCode.Name = "MakeCode";
             this.MakeCode.Power = null;
-            this.MakeCode.Size = new System.Drawing.Size(196, 25);
+            this.MakeCode.Size = new System.Drawing.Size(148, 21);
             this.MakeCode.Str = null;
             this.MakeCode.Str1 = null;
             this.MakeCode.Str2 = null;
@@ -171,12 +173,13 @@
             this.Search.DownImage = ((System.Drawing.Image)(resources.GetObject("Search.DownImage")));
             this.Search.Image = null;
             this.Search.IsShowBorder = true;
-            this.Search.Location = new System.Drawing.Point(358, 11);
+            this.Search.Location = new System.Drawing.Point(268, 9);
+            this.Search.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Search.MoveImage = ((System.Drawing.Image)(resources.GetObject("Search.MoveImage")));
             this.Search.Name = "Search";
             this.Search.NormalImage = ((System.Drawing.Image)(resources.GetObject("Search.NormalImage")));
             this.Search.Power = null;
-            this.Search.Size = new System.Drawing.Size(75, 28);
+            this.Search.Size = new System.Drawing.Size(56, 22);
             this.Search.TabIndex = 2;
             this.Search.Text = "查询";
             this.Search.UseVisualStyleBackColor = false;
@@ -199,9 +202,11 @@
             this.MakeInf.Controls.Add(this.ma_custname_label);
             this.MakeInf.Controls.Add(this.ma_salecode);
             this.MakeInf.Controls.Add(this.ma_salecode_label);
-            this.MakeInf.Location = new System.Drawing.Point(41, 50);
+            this.MakeInf.Location = new System.Drawing.Point(31, 40);
+            this.MakeInf.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MakeInf.Name = "MakeInf";
-            this.MakeInf.Size = new System.Drawing.Size(1182, 105);
+            this.MakeInf.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.MakeInf.Size = new System.Drawing.Size(886, 84);
             this.MakeInf.TabIndex = 3;
             this.MakeInf.TabStop = false;
             this.MakeInf.Text = "工单信息";
@@ -211,18 +216,20 @@
             // 
             this.ma_unlimitageqty.AutoSize = true;
             this.ma_unlimitageqty.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_unlimitageqty.Location = new System.Drawing.Point(668, 66);
+            this.ma_unlimitageqty.Location = new System.Drawing.Point(501, 53);
+            this.ma_unlimitageqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_unlimitageqty.Name = "ma_unlimitageqty";
-            this.ma_unlimitageqty.Size = new System.Drawing.Size(0, 23);
+            this.ma_unlimitageqty.Size = new System.Drawing.Size(0, 20);
             this.ma_unlimitageqty.TabIndex = 17;
             // 
             // ma_unlimitageqty_label
             // 
             this.ma_unlimitageqty_label.AutoSize = true;
             this.ma_unlimitageqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_unlimitageqty_label.Location = new System.Drawing.Point(556, 66);
+            this.ma_unlimitageqty_label.Location = new System.Drawing.Point(417, 53);
+            this.ma_unlimitageqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_unlimitageqty_label.Name = "ma_unlimitageqty_label";
-            this.ma_unlimitageqty_label.Size = new System.Drawing.Size(95, 23);
+            this.ma_unlimitageqty_label.Size = new System.Drawing.Size(79, 20);
             this.ma_unlimitageqty_label.TabIndex = 16;
             this.ma_unlimitageqty_label.Text = "不限老化数";
             // 
@@ -230,37 +237,41 @@
             // 
             this.ma_bomversion.AutoSize = true;
             this.ma_bomversion.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_bomversion.Location = new System.Drawing.Point(410, 66);
+            this.ma_bomversion.Location = new System.Drawing.Point(308, 53);
+            this.ma_bomversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_bomversion.Name = "ma_bomversion";
-            this.ma_bomversion.Size = new System.Drawing.Size(0, 23);
+            this.ma_bomversion.Size = new System.Drawing.Size(0, 20);
             this.ma_bomversion.TabIndex = 15;
             // 
             // ma_bomversion_label
             // 
             this.ma_bomversion_label.AutoSize = true;
             this.ma_bomversion_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_bomversion_label.Location = new System.Drawing.Point(303, 66);
+            this.ma_bomversion_label.Location = new System.Drawing.Point(227, 53);
+            this.ma_bomversion_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_bomversion_label.Name = "ma_bomversion_label";
-            this.ma_bomversion_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_bomversion_label.Size = new System.Drawing.Size(71, 20);
             this.ma_bomversion_label.TabIndex = 14;
-            this.ma_bomversion_label.Text = "销售订单";
+            this.ma_bomversion_label.Text = "BOM版本";
             // 
             // ma_qty
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_qty.Location = new System.Drawing.Point(147, 66);
+            this.ma_qty.Location = new System.Drawing.Point(110, 53);
+            this.ma_qty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_qty.Name = "ma_qty";
-            this.ma_qty.Size = new System.Drawing.Size(0, 23);
+            this.ma_qty.Size = new System.Drawing.Size(0, 20);
             this.ma_qty.TabIndex = 13;
             // 
             // ma_qty_label
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_qty_label.Location = new System.Drawing.Point(40, 66);
+            this.ma_qty_label.Location = new System.Drawing.Point(30, 53);
+            this.ma_qty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_qty_label.Name = "ma_qty_label";
-            this.ma_qty_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_qty_label.Size = new System.Drawing.Size(65, 20);
             this.ma_qty_label.TabIndex = 12;
             this.ma_qty_label.Text = "工单数量";
             // 
@@ -268,18 +279,20 @@
             // 
             this.ma_softversion.AutoSize = true;
             this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_softversion.Location = new System.Drawing.Point(929, 28);
+            this.ma_softversion.Location = new System.Drawing.Point(697, 22);
+            this.ma_softversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_softversion.Name = "ma_softversion";
-            this.ma_softversion.Size = new System.Drawing.Size(0, 23);
+            this.ma_softversion.Size = new System.Drawing.Size(0, 20);
             this.ma_softversion.TabIndex = 11;
             // 
             // ma_softversion_label
             // 
             this.ma_softversion_label.AutoSize = true;
             this.ma_softversion_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_softversion_label.Location = new System.Drawing.Point(819, 28);
+            this.ma_softversion_label.Location = new System.Drawing.Point(614, 22);
+            this.ma_softversion_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_softversion_label.Name = "ma_softversion_label";
-            this.ma_softversion_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_softversion_label.Size = new System.Drawing.Size(65, 20);
             this.ma_softversion_label.TabIndex = 10;
             this.ma_softversion_label.Text = "软件版本";
             // 
@@ -287,18 +300,20 @@
             // 
             this.ma_wccode.AutoSize = true;
             this.ma_wccode.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_wccode.Location = new System.Drawing.Point(668, 28);
+            this.ma_wccode.Location = new System.Drawing.Point(501, 22);
+            this.ma_wccode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_wccode.Name = "ma_wccode";
-            this.ma_wccode.Size = new System.Drawing.Size(0, 23);
+            this.ma_wccode.Size = new System.Drawing.Size(0, 20);
             this.ma_wccode.TabIndex = 9;
             // 
             // ma_wccode_label
             // 
             this.ma_wccode_label.AutoSize = true;
             this.ma_wccode_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_wccode_label.Location = new System.Drawing.Point(556, 28);
+            this.ma_wccode_label.Location = new System.Drawing.Point(417, 22);
+            this.ma_wccode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_wccode_label.Name = "ma_wccode_label";
-            this.ma_wccode_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_wccode_label.Size = new System.Drawing.Size(65, 20);
             this.ma_wccode_label.TabIndex = 8;
             this.ma_wccode_label.Text = "工作中心";
             // 
@@ -306,18 +321,20 @@
             // 
             this.ma_custname.AutoSize = true;
             this.ma_custname.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_custname.Location = new System.Drawing.Point(410, 28);
+            this.ma_custname.Location = new System.Drawing.Point(308, 22);
+            this.ma_custname.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_custname.Name = "ma_custname";
-            this.ma_custname.Size = new System.Drawing.Size(0, 23);
+            this.ma_custname.Size = new System.Drawing.Size(0, 20);
             this.ma_custname.TabIndex = 7;
             // 
             // ma_custname_label
             // 
             this.ma_custname_label.AutoSize = true;
             this.ma_custname_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_custname_label.Location = new System.Drawing.Point(303, 28);
+            this.ma_custname_label.Location = new System.Drawing.Point(227, 22);
+            this.ma_custname_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_custname_label.Name = "ma_custname_label";
-            this.ma_custname_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_custname_label.Size = new System.Drawing.Size(65, 20);
             this.ma_custname_label.TabIndex = 6;
             this.ma_custname_label.Text = "客户名称";
             // 
@@ -325,18 +342,20 @@
             // 
             this.ma_salecode.AutoSize = true;
             this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_salecode.Location = new System.Drawing.Point(147, 28);
+            this.ma_salecode.Location = new System.Drawing.Point(110, 22);
+            this.ma_salecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_salecode.Name = "ma_salecode";
-            this.ma_salecode.Size = new System.Drawing.Size(0, 23);
+            this.ma_salecode.Size = new System.Drawing.Size(0, 20);
             this.ma_salecode.TabIndex = 5;
             // 
             // ma_salecode_label
             // 
             this.ma_salecode_label.AutoSize = true;
             this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.ma_salecode_label.Location = new System.Drawing.Point(40, 28);
+            this.ma_salecode_label.Location = new System.Drawing.Point(30, 22);
+            this.ma_salecode_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ma_salecode_label.Name = "ma_salecode_label";
-            this.ma_salecode_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_salecode_label.Size = new System.Drawing.Size(65, 20);
             this.ma_salecode_label.TabIndex = 4;
             this.ma_salecode_label.Text = "销售订单";
             // 
@@ -357,9 +376,11 @@
             this.Product.Controls.Add(this.pr_detail_label);
             this.Product.Controls.Add(this.pr_code);
             this.Product.Controls.Add(this.pr_code_label);
-            this.Product.Location = new System.Drawing.Point(41, 165);
+            this.Product.Location = new System.Drawing.Point(31, 132);
+            this.Product.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Product.Name = "Product";
-            this.Product.Size = new System.Drawing.Size(1182, 105);
+            this.Product.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Product.Size = new System.Drawing.Size(886, 84);
             this.Product.TabIndex = 18;
             this.Product.TabStop = false;
             this.Product.Text = "产品信息";
@@ -369,18 +390,20 @@
             // 
             this.pr_cartonweight.AutoSize = true;
             this.pr_cartonweight.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_cartonweight.Location = new System.Drawing.Point(668, 67);
+            this.pr_cartonweight.Location = new System.Drawing.Point(501, 54);
+            this.pr_cartonweight.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_cartonweight.Name = "pr_cartonweight";
-            this.pr_cartonweight.Size = new System.Drawing.Size(0, 23);
+            this.pr_cartonweight.Size = new System.Drawing.Size(0, 20);
             this.pr_cartonweight.TabIndex = 17;
             // 
             // pr_cartonweight_label
             // 
             this.pr_cartonweight_label.AutoSize = true;
             this.pr_cartonweight_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_cartonweight_label.Location = new System.Drawing.Point(556, 67);
+            this.pr_cartonweight_label.Location = new System.Drawing.Point(417, 54);
+            this.pr_cartonweight_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_cartonweight_label.Name = "pr_cartonweight_label";
-            this.pr_cartonweight_label.Size = new System.Drawing.Size(95, 23);
+            this.pr_cartonweight_label.Size = new System.Drawing.Size(79, 20);
             this.pr_cartonweight_label.TabIndex = 16;
             this.pr_cartonweight_label.Text = "卡通箱重量";
             // 
@@ -388,18 +411,20 @@
             // 
             this.pr_colorboxweight.AutoSize = true;
             this.pr_colorboxweight.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_colorboxweight.Location = new System.Drawing.Point(410, 67);
+            this.pr_colorboxweight.Location = new System.Drawing.Point(308, 54);
+            this.pr_colorboxweight.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_colorboxweight.Name = "pr_colorboxweight";
-            this.pr_colorboxweight.Size = new System.Drawing.Size(0, 23);
+            this.pr_colorboxweight.Size = new System.Drawing.Size(0, 20);
             this.pr_colorboxweight.TabIndex = 15;
             // 
             // pr_colorboxweight_label
             // 
             this.pr_colorboxweight_label.AutoSize = true;
             this.pr_colorboxweight_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_colorboxweight_label.Location = new System.Drawing.Point(303, 67);
+            this.pr_colorboxweight_label.Location = new System.Drawing.Point(227, 54);
+            this.pr_colorboxweight_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_colorboxweight_label.Name = "pr_colorboxweight_label";
-            this.pr_colorboxweight_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_colorboxweight_label.Size = new System.Drawing.Size(65, 20);
             this.pr_colorboxweight_label.TabIndex = 14;
             this.pr_colorboxweight_label.Text = "彩盒重量";
             // 
@@ -407,18 +432,20 @@
             // 
             this.pr_agingtime.AutoSize = true;
             this.pr_agingtime.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_agingtime.Location = new System.Drawing.Point(147, 67);
+            this.pr_agingtime.Location = new System.Drawing.Point(110, 54);
+            this.pr_agingtime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_agingtime.Name = "pr_agingtime";
-            this.pr_agingtime.Size = new System.Drawing.Size(0, 23);
+            this.pr_agingtime.Size = new System.Drawing.Size(0, 20);
             this.pr_agingtime.TabIndex = 13;
             // 
             // pr_agingtime_label
             // 
             this.pr_agingtime_label.AutoSize = true;
             this.pr_agingtime_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_agingtime_label.Location = new System.Drawing.Point(40, 67);
+            this.pr_agingtime_label.Location = new System.Drawing.Point(30, 54);
+            this.pr_agingtime_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_agingtime_label.Name = "pr_agingtime_label";
-            this.pr_agingtime_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_agingtime_label.Size = new System.Drawing.Size(65, 20);
             this.pr_agingtime_label.TabIndex = 12;
             this.pr_agingtime_label.Text = "老化时长";
             // 
@@ -426,18 +453,20 @@
             // 
             this.pr_outboxinnerqty.AutoSize = true;
             this.pr_outboxinnerqty.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_outboxinnerqty.Location = new System.Drawing.Point(929, 29);
+            this.pr_outboxinnerqty.Location = new System.Drawing.Point(697, 23);
+            this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
-            this.pr_outboxinnerqty.Size = new System.Drawing.Size(0, 23);
+            this.pr_outboxinnerqty.Size = new System.Drawing.Size(0, 20);
             this.pr_outboxinnerqty.TabIndex = 11;
             // 
             // pr_outboxinnerqty_label
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(819, 29);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(614, 23);
+            this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
-            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(65, 20);
             this.pr_outboxinnerqty_label.TabIndex = 10;
             this.pr_outboxinnerqty_label.Text = "装箱容量";
             // 
@@ -445,18 +474,20 @@
             // 
             this.pr_sendchecktype.AutoSize = true;
             this.pr_sendchecktype.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_sendchecktype.Location = new System.Drawing.Point(668, 29);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(501, 23);
+            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 23);
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 20);
             this.pr_sendchecktype.TabIndex = 9;
             // 
             // pr_sendchecktype_label
             // 
             this.pr_sendchecktype_label.AutoSize = true;
             this.pr_sendchecktype_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_sendchecktype_label.Location = new System.Drawing.Point(556, 29);
+            this.pr_sendchecktype_label.Location = new System.Drawing.Point(417, 23);
+            this.pr_sendchecktype_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_sendchecktype_label.Name = "pr_sendchecktype_label";
-            this.pr_sendchecktype_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_sendchecktype_label.Size = new System.Drawing.Size(65, 20);
             this.pr_sendchecktype_label.TabIndex = 8;
             this.pr_sendchecktype_label.Text = "送检类型";
             // 
@@ -464,18 +495,20 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_detail.Location = new System.Drawing.Point(410, 29);
+            this.pr_detail.Location = new System.Drawing.Point(308, 23);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 23);
+            this.pr_detail.Size = new System.Drawing.Size(0, 20);
             this.pr_detail.TabIndex = 7;
             // 
             // pr_detail_label
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_detail_label.Location = new System.Drawing.Point(303, 29);
+            this.pr_detail_label.Location = new System.Drawing.Point(227, 23);
+            this.pr_detail_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail_label.Name = "pr_detail_label";
-            this.pr_detail_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_detail_label.Size = new System.Drawing.Size(65, 20);
             this.pr_detail_label.TabIndex = 6;
             this.pr_detail_label.Text = "产品名称";
             // 
@@ -483,18 +516,20 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_code.Location = new System.Drawing.Point(147, 29);
+            this.pr_code.Location = new System.Drawing.Point(110, 23);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_code.Name = "pr_code";
-            this.pr_code.Size = new System.Drawing.Size(0, 23);
+            this.pr_code.Size = new System.Drawing.Size(0, 20);
             this.pr_code.TabIndex = 5;
             // 
             // pr_code_label
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.pr_code_label.Location = new System.Drawing.Point(40, 29);
+            this.pr_code_label.Location = new System.Drawing.Point(30, 23);
+            this.pr_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_code_label.Name = "pr_code_label";
-            this.pr_code_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_code_label.Size = new System.Drawing.Size(65, 20);
             this.pr_code_label.TabIndex = 4;
             this.pr_code_label.Text = "产品编号";
             // 
@@ -515,9 +550,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.label13);
             this.groupBoxWithBorder1.Controls.Add(this.MacNum);
             this.groupBoxWithBorder1.Controls.Add(this.Mac);
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(41, 280);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(31, 224);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1182, 105);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(886, 84);
             this.groupBoxWithBorder1.TabIndex = 19;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "SN关联信息";
@@ -527,18 +564,20 @@
             // 
             this.aftersnqty.AutoSize = true;
             this.aftersnqty.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.aftersnqty.Location = new System.Drawing.Point(929, 67);
+            this.aftersnqty.Location = new System.Drawing.Point(697, 54);
+            this.aftersnqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.aftersnqty.Name = "aftersnqty";
-            this.aftersnqty.Size = new System.Drawing.Size(0, 23);
+            this.aftersnqty.Size = new System.Drawing.Size(0, 20);
             this.aftersnqty.TabIndex = 17;
             // 
             // aftersnqty_label
             // 
             this.aftersnqty_label.AutoSize = true;
             this.aftersnqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.aftersnqty_label.Location = new System.Drawing.Point(819, 67);
+            this.aftersnqty_label.Location = new System.Drawing.Point(614, 54);
+            this.aftersnqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.aftersnqty_label.Name = "aftersnqty_label";
-            this.aftersnqty_label.Size = new System.Drawing.Size(102, 23);
+            this.aftersnqty_label.Size = new System.Drawing.Size(84, 20);
             this.aftersnqty_label.TabIndex = 16;
             this.aftersnqty_label.Text = "转换后SN数";
             // 
@@ -546,18 +585,20 @@
             // 
             this.AfterSnRange.AutoSize = true;
             this.AfterSnRange.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.AfterSnRange.Location = new System.Drawing.Point(587, 67);
+            this.AfterSnRange.Location = new System.Drawing.Point(440, 54);
+            this.AfterSnRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.AfterSnRange.Name = "AfterSnRange";
-            this.AfterSnRange.Size = new System.Drawing.Size(0, 23);
+            this.AfterSnRange.Size = new System.Drawing.Size(0, 20);
             this.AfterSnRange.TabIndex = 15;
             // 
             // AfterSnRange_label
             // 
             this.AfterSnRange_label.AutoSize = true;
             this.AfterSnRange_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.AfterSnRange_label.Location = new System.Drawing.Point(445, 67);
+            this.AfterSnRange_label.Location = new System.Drawing.Point(334, 54);
+            this.AfterSnRange_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.AfterSnRange_label.Name = "AfterSnRange_label";
-            this.AfterSnRange_label.Size = new System.Drawing.Size(119, 23);
+            this.AfterSnRange_label.Size = new System.Drawing.Size(98, 20);
             this.AfterSnRange_label.TabIndex = 14;
             this.AfterSnRange_label.Text = "转换后SN范围";
             // 
@@ -565,18 +606,20 @@
             // 
             this.beforesnqty.AutoSize = true;
             this.beforesnqty.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforesnqty.Location = new System.Drawing.Point(929, 27);
+            this.beforesnqty.Location = new System.Drawing.Point(697, 22);
+            this.beforesnqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.beforesnqty.Name = "beforesnqty";
-            this.beforesnqty.Size = new System.Drawing.Size(0, 23);
+            this.beforesnqty.Size = new System.Drawing.Size(0, 20);
             this.beforesnqty.TabIndex = 13;
             // 
             // beforesnqty_label
             // 
             this.beforesnqty_label.AutoSize = true;
             this.beforesnqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.beforesnqty_label.Location = new System.Drawing.Point(819, 27);
+            this.beforesnqty_label.Location = new System.Drawing.Point(614, 22);
+            this.beforesnqty_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.beforesnqty_label.Name = "beforesnqty_label";
-            this.beforesnqty_label.Size = new System.Drawing.Size(102, 23);
+            this.beforesnqty_label.Size = new System.Drawing.Size(84, 20);
             this.beforesnqty_label.TabIndex = 12;
             this.beforesnqty_label.Text = "转换前SN数";
             // 
@@ -584,18 +627,20 @@
             // 
             this.BeforeSnRange.AutoSize = true;
             this.BeforeSnRange.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.BeforeSnRange.Location = new System.Drawing.Point(182, 67);
+            this.BeforeSnRange.Location = new System.Drawing.Point(136, 54);
+            this.BeforeSnRange.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BeforeSnRange.Name = "BeforeSnRange";
-            this.BeforeSnRange.Size = new System.Drawing.Size(0, 23);
+            this.BeforeSnRange.Size = new System.Drawing.Size(0, 20);
             this.BeforeSnRange.TabIndex = 11;
             // 
             // BeforeSnRange_label
             // 
             this.BeforeSnRange_label.AutoSize = true;
             this.BeforeSnRange_label.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.BeforeSnRange_label.Location = new System.Drawing.Point(40, 67);
+            this.BeforeSnRange_label.Location = new System.Drawing.Point(30, 54);
+            this.BeforeSnRange_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BeforeSnRange_label.Name = "BeforeSnRange_label";
-            this.BeforeSnRange_label.Size = new System.Drawing.Size(119, 23);
+            this.BeforeSnRange_label.Size = new System.Drawing.Size(98, 20);
             this.BeforeSnRange_label.TabIndex = 10;
             this.BeforeSnRange_label.Text = "转换前SN范围";
             // 
@@ -603,18 +648,20 @@
             // 
             this.IMEINum.AutoSize = true;
             this.IMEINum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.IMEINum.Location = new System.Drawing.Point(698, 27);
+            this.IMEINum.Location = new System.Drawing.Point(524, 22);
+            this.IMEINum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.IMEINum.Name = "IMEINum";
-            this.IMEINum.Size = new System.Drawing.Size(0, 23);
+            this.IMEINum.Size = new System.Drawing.Size(0, 20);
             this.IMEINum.TabIndex = 9;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label3.Location = new System.Drawing.Point(556, 27);
+            this.label3.Location = new System.Drawing.Point(417, 22);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(131, 23);
+            this.label3.Size = new System.Drawing.Size(109, 20);
             this.label3.TabIndex = 8;
             this.label3.Text = "已导入IMEI数量";
             // 
@@ -622,18 +669,20 @@
             // 
             this.BTNum.AutoSize = true;
             this.BTNum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.BTNum.Location = new System.Drawing.Point(434, 27);
+            this.BTNum.Location = new System.Drawing.Point(326, 22);
+            this.BTNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.BTNum.Name = "BTNum";
-            this.BTNum.Size = new System.Drawing.Size(0, 23);
+            this.BTNum.Size = new System.Drawing.Size(0, 20);
             this.BTNum.TabIndex = 7;
             // 
             // label13
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label13.Location = new System.Drawing.Point(303, 27);
+            this.label13.Location = new System.Drawing.Point(227, 22);
+            this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(116, 23);
+            this.label13.Size = new System.Drawing.Size(96, 20);
             this.label13.TabIndex = 6;
             this.label13.Text = "已导入BT数量";
             // 
@@ -641,18 +690,20 @@
             // 
             this.MacNum.AutoSize = true;
             this.MacNum.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.MacNum.Location = new System.Drawing.Point(182, 27);
+            this.MacNum.Location = new System.Drawing.Point(136, 22);
+            this.MacNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.MacNum.Name = "MacNum";
-            this.MacNum.Size = new System.Drawing.Size(0, 23);
+            this.MacNum.Size = new System.Drawing.Size(0, 20);
             this.MacNum.TabIndex = 5;
             // 
             // Mac
             // 
             this.Mac.AutoSize = true;
             this.Mac.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Mac.Location = new System.Drawing.Point(40, 27);
+            this.Mac.Location = new System.Drawing.Point(30, 22);
+            this.Mac.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.Mac.Name = "Mac";
-            this.Mac.Size = new System.Drawing.Size(130, 23);
+            this.Mac.Size = new System.Drawing.Size(108, 20);
             this.Mac.TabIndex = 4;
             this.Mac.Text = "已导入Mac数量";
             // 
@@ -686,11 +737,12 @@
             this.CD_NEXTSTEPCODE,
             this.CD_NEXTSTEPNAME,
             this.CD_TABLE});
-            this.Carft.Location = new System.Drawing.Point(41, 391);
+            this.Carft.Location = new System.Drawing.Point(31, 313);
+            this.Carft.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Carft.Name = "Carft";
             this.Carft.ReadOnly = true;
             this.Carft.RowTemplate.Height = 27;
-            this.Carft.Size = new System.Drawing.Size(1182, 278);
+            this.Carft.Size = new System.Drawing.Size(886, 222);
             this.Carft.TabIndex = 20;
             // 
             // CD_STEPNO
@@ -931,11 +983,12 @@
             this.SP_ONEUSEQTY,
             this.SP_UPDATEMAN,
             this.SP_UPDATEDATE});
-            this.BOM.Location = new System.Drawing.Point(41, 675);
+            this.BOM.Location = new System.Drawing.Point(31, 540);
+            this.BOM.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.BOM.Name = "BOM";
             this.BOM.ReadOnly = true;
             this.BOM.RowTemplate.Height = 27;
-            this.BOM.Size = new System.Drawing.Size(1182, 217);
+            this.BOM.Size = new System.Drawing.Size(886, 174);
             this.BOM.TabIndex = 21;
             // 
             // SP_MOTHERCODE
@@ -1046,11 +1099,12 @@
             this.LA_TEMPLATETYPE,
             this.LA_SOFTTYPE,
             this.LA_PRODCODE});
-            this.Label.Location = new System.Drawing.Point(41, 901);
+            this.Label.Location = new System.Drawing.Point(31, 721);
+            this.Label.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Label.Name = "Label";
             this.Label.ReadOnly = true;
             this.Label.RowTemplate.Height = 27;
-            this.Label.Size = new System.Drawing.Size(1182, 174);
+            this.Label.Size = new System.Drawing.Size(886, 139);
             this.Label.TabIndex = 22;
             // 
             // LA_CODE
@@ -1134,10 +1188,11 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(3, 486);
-            this.label16.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label16.Location = new System.Drawing.Point(2, 389);
+            this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label16.MaximumSize = new System.Drawing.Size(26, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(32, 108);
+            this.label16.Size = new System.Drawing.Size(26, 84);
             this.label16.TabIndex = 23;
             this.label16.Text = "产品途程";
             // 
@@ -1145,10 +1200,11 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(3, 712);
-            this.label17.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label17.Location = new System.Drawing.Point(2, 570);
+            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label17.MaximumSize = new System.Drawing.Size(26, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(32, 135);
+            this.label17.Size = new System.Drawing.Size(26, 105);
             this.label17.TabIndex = 24;
             this.label17.Text = "工序BOM";
             // 
@@ -1156,18 +1212,19 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(3, 927);
-            this.label18.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label18.Location = new System.Drawing.Point(2, 742);
+            this.label18.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label18.MaximumSize = new System.Drawing.Size(26, 0);
             this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(32, 108);
+            this.label18.Size = new System.Drawing.Size(26, 84);
             this.label18.TabIndex = 25;
             this.label18.Text = "标签信息";
             // 
             // Query_MakeInf
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1235, 1084);
+            this.ClientSize = new System.Drawing.Size(926, 867);
             this.Controls.Add(this.label18);
             this.Controls.Add(this.label17);
             this.Controls.Add(this.label16);
@@ -1181,6 +1238,7 @@
             this.Controls.Add(this.MakeCode);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.Name = "Query_MakeInf";
             this.Tag = "Query!MakeInf";
             this.Text = "Query_MakeInf";

UAS-MES/FunctionCode/Query/Query_MakeInf.cs

@@ -49,8 +49,8 @@ namespace UAS_MES.Query
                 string ma_salecode = dt.Rows[0]["ma_salecode"].ToString();
                 sql.Clear();
                 sql.Append("select pr_code,pr_outboxinnerqty,case pr_sendchecktype when 'SaleCode' then '按合同送检' when 'LineCode' then '按线别送检' end pr_sendchecktype,pr_detail,pr_agingtime");
-                sql.Append(",(pr_colorboxminw||'-'||pr_colorboxmaxw||' '||pr_colorboxunit)pr_colorboxweight,");
-                sql.Append("(pr_cartonminw||'-'||pr_cartonmaxw||' '||pr_cartonunit)pr_cartonweight from product where pr_code='" + ma_prodcode + "'");
+                sql.Append(",( CASE WHEN pr_colorboxminw LIKE '.%' THEN '0'||pr_colorboxminw ELSE to_char(pr_colorboxminw)  END  ||'-'||   CASE WHEN pr_colorboxmaxw LIKE '.%' THEN '0'||pr_colorboxmaxw ELSE to_char(pr_colorboxmaxw)  END ||' '||pr_colorboxunit)pr_colorboxweight,");
+                sql.Append("(CASE WHEN pr_cartonminw LIKE '.%' THEN '0'||pr_cartonminw ELSE to_char(pr_cartonminw)  END  ||'-'|| CASE WHEN pr_cartonmaxw LIKE '.%' THEN '0'||pr_cartonmaxw ELSE to_char(pr_cartonmaxw)  END   ||' '||pr_cartonunit)pr_cartonweight from product where pr_code='" + ma_prodcode + "'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
                 {

UAS-MES/FunctionCode/Query/Query_MakeInf.resx

@@ -231,81 +231,6 @@
   <metadata name="CD_TABLE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="CD_STEPNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFINPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFOUTPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFTEST.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFSNCHANGE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFOQC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFPACK.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFREPAIR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFOUTLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFSMTINOUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFSPC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFREDUCE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFMIDFINISH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFMIDINPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFBURNIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFBURNOUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_DETNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_NEXTSTEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_NEXTSTEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="CD_TABLE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="SP_MOTHERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -345,78 +270,6 @@
   <metadata name="SP_UPDATEDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="SP_MOTHERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_SONCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_REPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_TYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_DESCRIPTION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_DETNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_PREFIX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_TRACEKIND.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_LENGTH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_ONEUSEQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_UPDATEMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="SP_UPDATEDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_STATUS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_INDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_INMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_PRINTNOS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_URL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_ISDEFAULT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_TEMPLATETYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_SOFTTYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="LA_PRODCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="LA_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>