From 1544b9ba3902d93a3d701db3656227cc3b46dce8 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 01 八月 2025 14:45:09 +0800
Subject: [PATCH] 过站bug

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs |  794 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 396 insertions(+), 398 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 85086bd..723d430 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -42,21 +42,19 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_auditStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_businessStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_erpProductionOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_orderType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_businessStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_workOrderQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_nostockinqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_stockinqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -83,6 +81,8 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -104,7 +104,7 @@
             this.txt_auditor = new DevExpress.XtraEditors.TextEdit();
             this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
             this.txt_trackingNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_stockinqty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yrkQty = new DevExpress.XtraEditors.TextEdit();
             this.txt_batchNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_purchaseorderno = new DevExpress.XtraEditors.TextEdit();
@@ -121,7 +121,10 @@
             this.txt_bomVersion = new DevExpress.XtraEditors.TextEdit();
             this.txt_storageLowerLimit = new DevExpress.XtraEditors.TextEdit();
             this.txt_planReleaseDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_wrkQty = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -132,18 +135,15 @@
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -151,11 +151,12 @@
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -184,10 +185,8 @@
             this.gvMx1variableLossRate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1salesOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1issuingOrg2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1owner = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1supplyingOrg2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fsrctransorgid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fsrctransstockid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fstockstatusid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -202,6 +201,7 @@
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -237,7 +237,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_auditor.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_trackingNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockinqty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_batchNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseorderno.Properties)).BeginInit();
@@ -254,7 +254,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_bomVersion.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_storageLowerLimit.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_planReleaseDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -265,18 +268,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
@@ -284,17 +284,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -372,14 +374,13 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_auditStatus,
             this.gv_orderNo,
+            this.gv_businessStatus,
             this.gridColumn3,
             this.gridColumn2,
             this.gridColumn1,
             this.gv_erpProductionOrderNo,
             this.gv_orderType,
-            this.gv_businessStatus,
             this.gv_workOrderQty,
             this.gv_nostockinqty,
             this.gv_stockinqty,
@@ -405,26 +406,15 @@
             this.gv_stockowner,
             this.gridColumn4,
             this.gridColumn7,
-            this.gridColumn14});
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_auditStatus
-            // 
-            this.gv_auditStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_auditStatus.Caption = "瀹℃牳鐘舵��";
-            this.gv_auditStatus.FieldName = "auditStatusChk";
-            this.gv_auditStatus.MinWidth = 25;
-            this.gv_auditStatus.Name = "gv_auditStatus";
-            this.gv_auditStatus.OptionsColumn.AllowEdit = false;
-            this.gv_auditStatus.Tag = "query_a.AUDIT_STATUS";
-            this.gv_auditStatus.Visible = true;
-            this.gv_auditStatus.VisibleIndex = 0;
-            this.gv_auditStatus.Width = 50;
             // 
             // gv_orderNo
             // 
@@ -436,8 +426,21 @@
             this.gv_orderNo.OptionsColumn.AllowEdit = false;
             this.gv_orderNo.Tag = "query_a.ORDER_NO";
             this.gv_orderNo.Visible = true;
-            this.gv_orderNo.VisibleIndex = 1;
+            this.gv_orderNo.VisibleIndex = 3;
             this.gv_orderNo.Width = 120;
+            // 
+            // gv_businessStatus
+            // 
+            this.gv_businessStatus.AppearanceCell.Options.UseFont = true;
+            this.gv_businessStatus.Caption = "涓氬姟鐘舵��";
+            this.gv_businessStatus.FieldName = "businessStatus";
+            this.gv_businessStatus.MinWidth = 25;
+            this.gv_businessStatus.Name = "gv_businessStatus";
+            this.gv_businessStatus.OptionsColumn.AllowEdit = false;
+            this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
+            this.gv_businessStatus.Visible = true;
+            this.gv_businessStatus.VisibleIndex = 5;
+            this.gv_businessStatus.Width = 50;
             // 
             // gridColumn3
             // 
@@ -446,7 +449,7 @@
             this.gridColumn3.MinWidth = 10;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 2;
+            this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 100;
             // 
             // gridColumn2
@@ -456,7 +459,7 @@
             this.gridColumn2.MinWidth = 10;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 3;
+            this.gridColumn2.VisibleIndex = 7;
             this.gridColumn2.Width = 150;
             // 
             // gridColumn1
@@ -466,7 +469,7 @@
             this.gridColumn1.MinWidth = 10;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.VisibleIndex = 8;
             this.gridColumn1.Width = 150;
             // 
             // gv_erpProductionOrderNo
@@ -479,7 +482,7 @@
             this.gv_erpProductionOrderNo.OptionsColumn.AllowEdit = false;
             this.gv_erpProductionOrderNo.Tag = "query_a.ERP_PRODUCTION_ORDER_NO";
             this.gv_erpProductionOrderNo.Visible = true;
-            this.gv_erpProductionOrderNo.VisibleIndex = 5;
+            this.gv_erpProductionOrderNo.VisibleIndex = 4;
             this.gv_erpProductionOrderNo.Width = 94;
             // 
             // gv_orderType
@@ -492,21 +495,8 @@
             this.gv_orderType.OptionsColumn.AllowEdit = false;
             this.gv_orderType.Tag = "query_a.ORDER_TYPE";
             this.gv_orderType.Visible = true;
-            this.gv_orderType.VisibleIndex = 6;
+            this.gv_orderType.VisibleIndex = 9;
             this.gv_orderType.Width = 94;
-            // 
-            // gv_businessStatus
-            // 
-            this.gv_businessStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_businessStatus.Caption = "涓氬姟鐘舵��";
-            this.gv_businessStatus.FieldName = "businessStatus";
-            this.gv_businessStatus.MinWidth = 25;
-            this.gv_businessStatus.Name = "gv_businessStatus";
-            this.gv_businessStatus.OptionsColumn.AllowEdit = false;
-            this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
-            this.gv_businessStatus.Visible = true;
-            this.gv_businessStatus.VisibleIndex = 7;
-            this.gv_businessStatus.Width = 50;
             // 
             // gv_workOrderQty
             // 
@@ -518,33 +508,33 @@
             this.gv_workOrderQty.OptionsColumn.AllowEdit = false;
             this.gv_workOrderQty.Tag = "query_a.WORK_ORDER_QTY";
             this.gv_workOrderQty.Visible = true;
-            this.gv_workOrderQty.VisibleIndex = 8;
+            this.gv_workOrderQty.VisibleIndex = 10;
             this.gv_workOrderQty.Width = 50;
             // 
             // gv_nostockinqty
             // 
             this.gv_nostockinqty.AppearanceCell.Options.UseFont = true;
             this.gv_nostockinqty.Caption = "鏈叆搴撴暟閲� ";
-            this.gv_nostockinqty.FieldName = "nostockinqty";
+            this.gv_nostockinqty.FieldName = "wrkQty";
             this.gv_nostockinqty.MinWidth = 25;
             this.gv_nostockinqty.Name = "gv_nostockinqty";
             this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
             this.gv_nostockinqty.Tag = "query_a.NOSTOCKINQTY";
             this.gv_nostockinqty.Visible = true;
-            this.gv_nostockinqty.VisibleIndex = 9;
+            this.gv_nostockinqty.VisibleIndex = 12;
             this.gv_nostockinqty.Width = 50;
             // 
             // gv_stockinqty
             // 
             this.gv_stockinqty.AppearanceCell.Options.UseFont = true;
             this.gv_stockinqty.Caption = "鍏ュ簱鏁伴噺 ";
-            this.gv_stockinqty.FieldName = "stockinqty";
+            this.gv_stockinqty.FieldName = "yrkQty";
             this.gv_stockinqty.MinWidth = 25;
             this.gv_stockinqty.Name = "gv_stockinqty";
             this.gv_stockinqty.OptionsColumn.AllowEdit = false;
             this.gv_stockinqty.Tag = "query_a.STOCKINQTY";
             this.gv_stockinqty.Visible = true;
-            this.gv_stockinqty.VisibleIndex = 10;
+            this.gv_stockinqty.VisibleIndex = 11;
             this.gv_stockinqty.Width = 50;
             // 
             // gv_unit
@@ -557,33 +547,33 @@
             this.gv_unit.OptionsColumn.AllowEdit = false;
             this.gv_unit.Tag = "query_a.UNIT";
             this.gv_unit.Visible = true;
-            this.gv_unit.VisibleIndex = 12;
+            this.gv_unit.VisibleIndex = 15;
             this.gv_unit.Width = 50;
             // 
             // gv_estimatedStartTime
             // 
             this.gv_estimatedStartTime.AppearanceCell.Options.UseFont = true;
-            this.gv_estimatedStartTime.Caption = "棰勮寮�宸ユ椂闂� ";
+            this.gv_estimatedStartTime.Caption = "Erp棰勮寮�宸�";
             this.gv_estimatedStartTime.FieldName = "estimatedStartTime";
             this.gv_estimatedStartTime.MinWidth = 10;
             this.gv_estimatedStartTime.Name = "gv_estimatedStartTime";
             this.gv_estimatedStartTime.OptionsColumn.AllowEdit = false;
             this.gv_estimatedStartTime.Tag = "query_a.ESTIMATED_START_TIME";
             this.gv_estimatedStartTime.Visible = true;
-            this.gv_estimatedStartTime.VisibleIndex = 11;
+            this.gv_estimatedStartTime.VisibleIndex = 13;
             this.gv_estimatedStartTime.Width = 180;
             // 
             // gv_estimatedEndTime
             // 
             this.gv_estimatedEndTime.AppearanceCell.Options.UseFont = true;
-            this.gv_estimatedEndTime.Caption = "棰勮瀹屽伐鏃堕棿 ";
+            this.gv_estimatedEndTime.Caption = "Erp棰勮瀹屽伐";
             this.gv_estimatedEndTime.FieldName = "estimatedEndTime";
             this.gv_estimatedEndTime.MinWidth = 10;
             this.gv_estimatedEndTime.Name = "gv_estimatedEndTime";
             this.gv_estimatedEndTime.OptionsColumn.AllowEdit = false;
             this.gv_estimatedEndTime.Tag = "query_a.ESTIMATED_END_TIME";
             this.gv_estimatedEndTime.Visible = true;
-            this.gv_estimatedEndTime.VisibleIndex = 13;
+            this.gv_estimatedEndTime.VisibleIndex = 14;
             this.gv_estimatedEndTime.Width = 180;
             // 
             // gv_planReleaseDate
@@ -596,7 +586,7 @@
             this.gv_planReleaseDate.OptionsColumn.AllowEdit = false;
             this.gv_planReleaseDate.Tag = "query_a.PLAN_RELEASE_DATE";
             this.gv_planReleaseDate.Visible = true;
-            this.gv_planReleaseDate.VisibleIndex = 14;
+            this.gv_planReleaseDate.VisibleIndex = 16;
             this.gv_planReleaseDate.Width = 94;
             // 
             // gv_storageUpperLimit
@@ -609,7 +599,7 @@
             this.gv_storageUpperLimit.OptionsColumn.AllowEdit = false;
             this.gv_storageUpperLimit.Tag = "query_a.STORAGE_UPPER_LIMIT";
             this.gv_storageUpperLimit.Visible = true;
-            this.gv_storageUpperLimit.VisibleIndex = 15;
+            this.gv_storageUpperLimit.VisibleIndex = 17;
             this.gv_storageUpperLimit.Width = 50;
             // 
             // gv_storageLowerLimit
@@ -622,7 +612,7 @@
             this.gv_storageLowerLimit.OptionsColumn.AllowEdit = false;
             this.gv_storageLowerLimit.Tag = "query_a.STORAGE_LOWER_LIMIT";
             this.gv_storageLowerLimit.Visible = true;
-            this.gv_storageLowerLimit.VisibleIndex = 17;
+            this.gv_storageLowerLimit.VisibleIndex = 18;
             this.gv_storageLowerLimit.Width = 50;
             // 
             // gv_trackingNo
@@ -634,8 +624,6 @@
             this.gv_trackingNo.Name = "gv_trackingNo";
             this.gv_trackingNo.OptionsColumn.AllowEdit = false;
             this.gv_trackingNo.Tag = "query_a.TRACKING_NO";
-            this.gv_trackingNo.Visible = true;
-            this.gv_trackingNo.VisibleIndex = 16;
             this.gv_trackingNo.Width = 94;
             // 
             // gv_batchNo
@@ -648,7 +636,7 @@
             this.gv_batchNo.OptionsColumn.AllowEdit = false;
             this.gv_batchNo.Tag = "query_a.BATCH_NO";
             this.gv_batchNo.Visible = true;
-            this.gv_batchNo.VisibleIndex = 18;
+            this.gv_batchNo.VisibleIndex = 19;
             this.gv_batchNo.Width = 94;
             // 
             // gv_bomVersion
@@ -661,7 +649,7 @@
             this.gv_bomVersion.OptionsColumn.AllowEdit = false;
             this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
             this.gv_bomVersion.Visible = true;
-            this.gv_bomVersion.VisibleIndex = 19;
+            this.gv_bomVersion.VisibleIndex = 20;
             this.gv_bomVersion.Width = 94;
             // 
             // gv_generationMethod
@@ -674,7 +662,7 @@
             this.gv_generationMethod.OptionsColumn.AllowEdit = false;
             this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
             this.gv_generationMethod.Visible = true;
-            this.gv_generationMethod.VisibleIndex = 20;
+            this.gv_generationMethod.VisibleIndex = 21;
             this.gv_generationMethod.Width = 94;
             // 
             // gv_demandOrderNo
@@ -687,7 +675,7 @@
             this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
             this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
             this.gv_demandOrderNo.Visible = true;
-            this.gv_demandOrderNo.VisibleIndex = 21;
+            this.gv_demandOrderNo.VisibleIndex = 22;
             this.gv_demandOrderNo.Width = 94;
             // 
             // gv_demandOrderLineNo
@@ -700,7 +688,7 @@
             this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
             this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
             this.gv_demandOrderLineNo.Visible = true;
-            this.gv_demandOrderLineNo.VisibleIndex = 22;
+            this.gv_demandOrderLineNo.VisibleIndex = 23;
             this.gv_demandOrderLineNo.Width = 60;
             // 
             // gv_closingPerson
@@ -712,8 +700,6 @@
             this.gv_closingPerson.Name = "gv_closingPerson";
             this.gv_closingPerson.OptionsColumn.AllowEdit = false;
             this.gv_closingPerson.Tag = "query_a.CLOSING_PERSON";
-            this.gv_closingPerson.Visible = true;
-            this.gv_closingPerson.VisibleIndex = 23;
             this.gv_closingPerson.Width = 94;
             // 
             // gv_closingType
@@ -725,8 +711,6 @@
             this.gv_closingType.Name = "gv_closingType";
             this.gv_closingType.OptionsColumn.AllowEdit = false;
             this.gv_closingType.Tag = "query_a.CLOSING_TYPE";
-            this.gv_closingType.Visible = true;
-            this.gv_closingType.VisibleIndex = 24;
             this.gv_closingType.Width = 94;
             // 
             // gv_remarks
@@ -739,7 +723,7 @@
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.Tag = "query_a.REMARKS";
             this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 25;
+            this.gv_remarks.VisibleIndex = 24;
             this.gv_remarks.Width = 94;
             // 
             // gv_purchaseorderno
@@ -752,7 +736,7 @@
             this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
             this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
             this.gv_purchaseorderno.Visible = true;
-            this.gv_purchaseorderno.VisibleIndex = 26;
+            this.gv_purchaseorderno.VisibleIndex = 25;
             this.gv_purchaseorderno.Width = 94;
             // 
             // gv_purchaseorderentryseq
@@ -765,33 +749,33 @@
             this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
             this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
             this.gv_purchaseorderentryseq.Visible = true;
-            this.gv_purchaseorderentryseq.VisibleIndex = 27;
+            this.gv_purchaseorderentryseq.VisibleIndex = 26;
             this.gv_purchaseorderentryseq.Width = 70;
             // 
             // gv_auditor
             // 
             this.gv_auditor.AppearanceCell.Options.UseFont = true;
-            this.gv_auditor.Caption = "瀹℃牳浜� ";
+            this.gv_auditor.Caption = "Mes瀹℃牳浜� ";
             this.gv_auditor.FieldName = "auditor";
             this.gv_auditor.MinWidth = 25;
             this.gv_auditor.Name = "gv_auditor";
             this.gv_auditor.OptionsColumn.AllowEdit = false;
             this.gv_auditor.Tag = "query_a.AUDITOR";
             this.gv_auditor.Visible = true;
-            this.gv_auditor.VisibleIndex = 28;
+            this.gv_auditor.VisibleIndex = 2;
             this.gv_auditor.Width = 94;
             // 
             // gv_auditDate
             // 
             this.gv_auditDate.AppearanceCell.Options.UseFont = true;
-            this.gv_auditDate.Caption = "瀹℃牳鏃堕棿 ";
+            this.gv_auditDate.Caption = "Mes瀹℃牳鏃堕棿 ";
             this.gv_auditDate.FieldName = "auditDate";
             this.gv_auditDate.MinWidth = 25;
             this.gv_auditDate.Name = "gv_auditDate";
             this.gv_auditDate.OptionsColumn.AllowEdit = false;
             this.gv_auditDate.Tag = "query_a.AUDIT_DATE";
             this.gv_auditDate.Visible = true;
-            this.gv_auditDate.VisibleIndex = 29;
+            this.gv_auditDate.VisibleIndex = 1;
             this.gv_auditDate.Width = 94;
             // 
             // gv_stockowner
@@ -820,7 +804,7 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 30;
+            this.gridColumn7.VisibleIndex = 27;
             this.gridColumn7.Width = 94;
             // 
             // gridColumn14
@@ -830,8 +814,26 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 31;
+            this.gridColumn14.VisibleIndex = 28;
             this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "涓婚敭Guid";
+            this.gridColumn15.FieldName = "guid";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "瀹℃牳";
+            this.gridColumn16.FieldName = "auditStatusChk";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 0;
+            this.gridColumn16.Width = 94;
             // 
             // pageBar1
             // 
@@ -870,7 +872,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 651);
-            this.splitMx1.SplitterPosition = 303;
+            this.splitMx1.SplitterPosition = 238;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -892,7 +894,7 @@
             this.layoutMx1.Controls.Add(this.txt_auditor);
             this.layoutMx1.Controls.Add(this.txt_remarks);
             this.layoutMx1.Controls.Add(this.txt_trackingNo);
-            this.layoutMx1.Controls.Add(this.txt_stockinqty);
+            this.layoutMx1.Controls.Add(this.txt_yrkQty);
             this.layoutMx1.Controls.Add(this.txt_batchNo);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
             this.layoutMx1.Controls.Add(this.txt_purchaseorderno);
@@ -909,14 +911,18 @@
             this.layoutMx1.Controls.Add(this.txt_bomVersion);
             this.layoutMx1.Controls.Add(this.txt_storageLowerLimit);
             this.layoutMx1.Controls.Add(this.txt_planReleaseDate);
+            this.layoutMx1.Controls.Add(this.txt_wrkQty);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem34});
+            this.layoutControlItem34,
+            this.layoutControlItem29,
+            this.layoutControlItem32,
+            this.layoutControlItem8});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 44, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 303);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 238);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -940,10 +946,10 @@
             // 
             // txt_stockownerName
             // 
-            this.txt_stockownerName.Location = new System.Drawing.Point(390, 229);
+            this.txt_stockownerName.Location = new System.Drawing.Point(114, 208);
             this.txt_stockownerName.Name = "txt_stockownerName";
             this.txt_stockownerName.Properties.Appearance.Options.UseFont = true;
-            this.txt_stockownerName.Size = new System.Drawing.Size(170, 24);
+            this.txt_stockownerName.Size = new System.Drawing.Size(165, 24);
             this.txt_stockownerName.StyleController = this.layoutMx1;
             this.txt_stockownerName.TabIndex = 664;
             // 
@@ -952,79 +958,79 @@
             this.txt_orderNo.Location = new System.Drawing.Point(114, 12);
             this.txt_orderNo.Name = "txt_orderNo";
             this.txt_orderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_orderNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_orderNo.Size = new System.Drawing.Size(165, 24);
             this.txt_orderNo.StyleController = this.layoutMx1;
             this.txt_orderNo.TabIndex = 211;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(666, 74);
+            this.txt_itemModel.Location = new System.Drawing.Point(656, 96);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 662;
             // 
             // txt_orderType
             // 
-            this.txt_orderType.Location = new System.Drawing.Point(390, 12);
+            this.txt_orderType.Location = new System.Drawing.Point(385, 12);
             this.txt_orderType.Name = "txt_orderType";
             this.txt_orderType.Properties.Appearance.Options.UseFont = true;
-            this.txt_orderType.Size = new System.Drawing.Size(170, 24);
+            this.txt_orderType.Size = new System.Drawing.Size(165, 24);
             this.txt_orderType.StyleController = this.layoutMx1;
             this.txt_orderType.TabIndex = 219;
             // 
             // txt_auditDate
             // 
-            this.txt_auditDate.Location = new System.Drawing.Point(942, 198);
+            this.txt_auditDate.Location = new System.Drawing.Point(927, 152);
             this.txt_auditDate.Name = "txt_auditDate";
             this.txt_auditDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_auditDate.Size = new System.Drawing.Size(172, 24);
+            this.txt_auditDate.Size = new System.Drawing.Size(166, 24);
             this.txt_auditDate.StyleController = this.layoutMx1;
             this.txt_auditDate.TabIndex = 532;
             // 
             // txt_planConfirmation
             // 
-            this.txt_planConfirmation.Location = new System.Drawing.Point(942, 167);
+            this.txt_planConfirmation.Location = new System.Drawing.Point(927, 124);
             this.txt_planConfirmation.Name = "txt_planConfirmation";
             this.txt_planConfirmation.Properties.Appearance.Options.UseFont = true;
-            this.txt_planConfirmation.Size = new System.Drawing.Size(172, 24);
+            this.txt_planConfirmation.Size = new System.Drawing.Size(166, 24);
             this.txt_planConfirmation.StyleController = this.layoutMx1;
             this.txt_planConfirmation.TabIndex = 627;
             // 
             // txt_workOrderQty
             // 
-            this.txt_workOrderQty.Location = new System.Drawing.Point(666, 12);
+            this.txt_workOrderQty.Location = new System.Drawing.Point(656, 12);
             this.txt_workOrderQty.Name = "txt_workOrderQty";
             this.txt_workOrderQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_workOrderQty.Size = new System.Drawing.Size(170, 24);
+            this.txt_workOrderQty.Size = new System.Drawing.Size(165, 24);
             this.txt_workOrderQty.StyleController = this.layoutMx1;
             this.txt_workOrderQty.TabIndex = 231;
             // 
             // txt_auditStatus
             // 
-            this.txt_auditStatus.Location = new System.Drawing.Point(942, 260);
+            this.txt_auditStatus.Location = new System.Drawing.Point(927, 208);
             this.txt_auditStatus.Name = "txt_auditStatus";
             this.txt_auditStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_auditStatus.Size = new System.Drawing.Size(172, 24);
+            this.txt_auditStatus.Size = new System.Drawing.Size(166, 24);
             this.txt_auditStatus.StyleController = this.layoutMx1;
             this.txt_auditStatus.TabIndex = 507;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(390, 74);
+            this.txt_itemName.Location = new System.Drawing.Point(385, 68);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(165, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 660;
             // 
             // txt_businessStatusTxt
             // 
-            this.txt_businessStatusTxt.Location = new System.Drawing.Point(942, 12);
+            this.txt_businessStatusTxt.Location = new System.Drawing.Point(927, 12);
             this.txt_businessStatusTxt.Name = "txt_businessStatusTxt";
             this.txt_businessStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessStatusTxt.Size = new System.Drawing.Size(172, 24);
+            this.txt_businessStatusTxt.Size = new System.Drawing.Size(166, 24);
             this.txt_businessStatusTxt.StyleController = this.layoutMx1;
             this.txt_businessStatusTxt.TabIndex = 222;
             // 
@@ -1039,192 +1045,200 @@
             // 
             // txt_erpProductionOrderNo
             // 
-            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 43);
+            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 40);
             this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
             this.txt_erpProductionOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(165, 24);
             this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
             this.txt_erpProductionOrderNo.TabIndex = 319;
             // 
             // txt_auditor
             // 
-            this.txt_auditor.Location = new System.Drawing.Point(942, 229);
+            this.txt_auditor.Location = new System.Drawing.Point(927, 180);
             this.txt_auditor.Name = "txt_auditor";
             this.txt_auditor.Properties.Appearance.Options.UseFont = true;
-            this.txt_auditor.Size = new System.Drawing.Size(172, 24);
+            this.txt_auditor.Size = new System.Drawing.Size(166, 24);
             this.txt_auditor.StyleController = this.layoutMx1;
             this.txt_auditor.TabIndex = 519;
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(114, 260);
+            this.txt_remarks.Location = new System.Drawing.Point(385, 208);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(446, 24);
+            this.txt_remarks.Size = new System.Drawing.Size(436, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 397;
             // 
             // txt_trackingNo
             // 
-            this.txt_trackingNo.Location = new System.Drawing.Point(390, 43);
+            this.txt_trackingNo.Location = new System.Drawing.Point(385, 40);
             this.txt_trackingNo.Name = "txt_trackingNo";
             this.txt_trackingNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_trackingNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_trackingNo.Size = new System.Drawing.Size(165, 24);
             this.txt_trackingNo.StyleController = this.layoutMx1;
             this.txt_trackingNo.TabIndex = 267;
             // 
-            // txt_stockinqty
+            // txt_yrkQty
             // 
-            this.txt_stockinqty.Location = new System.Drawing.Point(666, 43);
-            this.txt_stockinqty.Name = "txt_stockinqty";
-            this.txt_stockinqty.Properties.Appearance.Options.UseFont = true;
-            this.txt_stockinqty.Size = new System.Drawing.Size(170, 24);
-            this.txt_stockinqty.StyleController = this.layoutMx1;
-            this.txt_stockinqty.TabIndex = 471;
+            this.txt_yrkQty.Location = new System.Drawing.Point(656, 40);
+            this.txt_yrkQty.Name = "txt_yrkQty";
+            this.txt_yrkQty.Properties.Appearance.Options.UseFont = true;
+            this.txt_yrkQty.Size = new System.Drawing.Size(165, 24);
+            this.txt_yrkQty.StyleController = this.layoutMx1;
+            this.txt_yrkQty.TabIndex = 471;
             // 
             // txt_batchNo
             // 
-            this.txt_batchNo.Location = new System.Drawing.Point(666, 198);
+            this.txt_batchNo.Location = new System.Drawing.Point(656, 208);
             this.txt_batchNo.Name = "txt_batchNo";
             this.txt_batchNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_batchNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_batchNo.Size = new System.Drawing.Size(165, 24);
             this.txt_batchNo.StyleController = this.layoutMx1;
             this.txt_batchNo.TabIndex = 273;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(114, 74);
+            this.txt_itemNo.Location = new System.Drawing.Point(114, 68);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(165, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 226;
             // 
             // txt_purchaseorderno
             // 
-            this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 105);
+            this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 96);
             this.txt_purchaseorderno.Name = "txt_purchaseorderno";
             this.txt_purchaseorderno.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseorderno.Size = new System.Drawing.Size(170, 24);
+            this.txt_purchaseorderno.Size = new System.Drawing.Size(165, 24);
             this.txt_purchaseorderno.StyleController = this.layoutMx1;
             this.txt_purchaseorderno.TabIndex = 427;
             // 
             // txt_demandOrderNo
             // 
-            this.txt_demandOrderNo.Location = new System.Drawing.Point(390, 105);
+            this.txt_demandOrderNo.Location = new System.Drawing.Point(385, 96);
             this.txt_demandOrderNo.Name = "txt_demandOrderNo";
             this.txt_demandOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_demandOrderNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_demandOrderNo.Size = new System.Drawing.Size(165, 24);
             this.txt_demandOrderNo.StyleController = this.layoutMx1;
             this.txt_demandOrderNo.TabIndex = 351;
             // 
             // txt_purchaseorderentryseq
             // 
-            this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 136);
+            this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 124);
             this.txt_purchaseorderentryseq.Name = "txt_purchaseorderentryseq";
             this.txt_purchaseorderentryseq.Properties.Appearance.Options.UseFont = true;
-            this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(170, 24);
+            this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(165, 24);
             this.txt_purchaseorderentryseq.StyleController = this.layoutMx1;
             this.txt_purchaseorderentryseq.TabIndex = 438;
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(666, 105);
+            this.txt_dwName.Location = new System.Drawing.Point(656, 124);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(170, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(165, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 228;
             // 
             // txt_closingType
             // 
-            this.txt_closingType.Location = new System.Drawing.Point(390, 198);
+            this.txt_closingType.Location = new System.Drawing.Point(385, 180);
             this.txt_closingType.Name = "txt_closingType";
             this.txt_closingType.Properties.Appearance.Options.UseFont = true;
-            this.txt_closingType.Size = new System.Drawing.Size(170, 24);
+            this.txt_closingType.Size = new System.Drawing.Size(165, 24);
             this.txt_closingType.StyleController = this.layoutMx1;
             this.txt_closingType.TabIndex = 378;
             // 
             // txt_estimatedStartTime
             // 
-            this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 74);
+            this.txt_estimatedStartTime.Location = new System.Drawing.Point(927, 40);
             this.txt_estimatedStartTime.Name = "txt_estimatedStartTime";
             this.txt_estimatedStartTime.Properties.Appearance.Options.UseFont = true;
-            this.txt_estimatedStartTime.Size = new System.Drawing.Size(172, 24);
+            this.txt_estimatedStartTime.Size = new System.Drawing.Size(166, 24);
             this.txt_estimatedStartTime.StyleController = this.layoutMx1;
             this.txt_estimatedStartTime.TabIndex = 243;
             // 
             // txt_demandOrderLineNo
             // 
-            this.txt_demandOrderLineNo.Location = new System.Drawing.Point(390, 136);
+            this.txt_demandOrderLineNo.Location = new System.Drawing.Point(385, 124);
             this.txt_demandOrderLineNo.Name = "txt_demandOrderLineNo";
             this.txt_demandOrderLineNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_demandOrderLineNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_demandOrderLineNo.Size = new System.Drawing.Size(165, 24);
             this.txt_demandOrderLineNo.StyleController = this.layoutMx1;
             this.txt_demandOrderLineNo.TabIndex = 360;
             // 
             // txt_sourceOrderNo
             // 
-            this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 198);
+            this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 180);
             this.txt_sourceOrderNo.Name = "txt_sourceOrderNo";
             this.txt_sourceOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_sourceOrderNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_sourceOrderNo.Size = new System.Drawing.Size(165, 24);
             this.txt_sourceOrderNo.StyleController = this.layoutMx1;
             this.txt_sourceOrderNo.TabIndex = 336;
             // 
             // txt_closingPerson
             // 
-            this.txt_closingPerson.Location = new System.Drawing.Point(390, 167);
+            this.txt_closingPerson.Location = new System.Drawing.Point(385, 152);
             this.txt_closingPerson.Name = "txt_closingPerson";
             this.txt_closingPerson.Properties.Appearance.Options.UseFont = true;
-            this.txt_closingPerson.Size = new System.Drawing.Size(170, 24);
+            this.txt_closingPerson.Size = new System.Drawing.Size(165, 24);
             this.txt_closingPerson.StyleController = this.layoutMx1;
             this.txt_closingPerson.TabIndex = 370;
             // 
             // txt_storageUpperLimit
             // 
-            this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 136);
+            this.txt_storageUpperLimit.Location = new System.Drawing.Point(656, 152);
             this.txt_storageUpperLimit.Name = "txt_storageUpperLimit";
             this.txt_storageUpperLimit.Properties.Appearance.Options.UseFont = true;
-            this.txt_storageUpperLimit.Size = new System.Drawing.Size(170, 24);
+            this.txt_storageUpperLimit.Size = new System.Drawing.Size(165, 24);
             this.txt_storageUpperLimit.StyleController = this.layoutMx1;
             this.txt_storageUpperLimit.TabIndex = 258;
             // 
             // txt_estimatedEndTime
             // 
-            this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 105);
+            this.txt_estimatedEndTime.Location = new System.Drawing.Point(927, 68);
             this.txt_estimatedEndTime.Name = "txt_estimatedEndTime";
             this.txt_estimatedEndTime.Properties.Appearance.Options.UseFont = true;
-            this.txt_estimatedEndTime.Size = new System.Drawing.Size(172, 24);
+            this.txt_estimatedEndTime.Size = new System.Drawing.Size(166, 24);
             this.txt_estimatedEndTime.StyleController = this.layoutMx1;
             this.txt_estimatedEndTime.TabIndex = 247;
             // 
             // txt_bomVersion
             // 
-            this.txt_bomVersion.Location = new System.Drawing.Point(114, 167);
+            this.txt_bomVersion.Location = new System.Drawing.Point(114, 152);
             this.txt_bomVersion.Name = "txt_bomVersion";
             this.txt_bomVersion.Properties.Appearance.Options.UseFont = true;
-            this.txt_bomVersion.Size = new System.Drawing.Size(170, 24);
+            this.txt_bomVersion.Size = new System.Drawing.Size(165, 24);
             this.txt_bomVersion.StyleController = this.layoutMx1;
             this.txt_bomVersion.TabIndex = 280;
             // 
             // txt_storageLowerLimit
             // 
-            this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 167);
+            this.txt_storageLowerLimit.Location = new System.Drawing.Point(656, 180);
             this.txt_storageLowerLimit.Name = "txt_storageLowerLimit";
             this.txt_storageLowerLimit.Properties.Appearance.Options.UseFont = true;
-            this.txt_storageLowerLimit.Size = new System.Drawing.Size(170, 24);
+            this.txt_storageLowerLimit.Size = new System.Drawing.Size(165, 24);
             this.txt_storageLowerLimit.StyleController = this.layoutMx1;
             this.txt_storageLowerLimit.TabIndex = 262;
             // 
             // txt_planReleaseDate
             // 
-            this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 136);
+            this.txt_planReleaseDate.Location = new System.Drawing.Point(927, 96);
             this.txt_planReleaseDate.Name = "txt_planReleaseDate";
             this.txt_planReleaseDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_planReleaseDate.Size = new System.Drawing.Size(172, 24);
+            this.txt_planReleaseDate.Size = new System.Drawing.Size(166, 24);
             this.txt_planReleaseDate.StyleController = this.layoutMx1;
             this.txt_planReleaseDate.TabIndex = 252;
+            // 
+            // txt_wrkQty
+            // 
+            this.txt_wrkQty.Location = new System.Drawing.Point(656, 68);
+            this.txt_wrkQty.Name = "txt_wrkQty";
+            this.txt_wrkQty.Size = new System.Drawing.Size(165, 24);
+            this.txt_wrkQty.StyleController = this.layoutMx1;
+            this.txt_wrkQty.TabIndex = 667;
             // 
             // layoutControlItem34
             // 
@@ -1237,6 +1251,27 @@
             this.layoutControlItem34.Text = "lbGuid";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_stockowner;
+            this.layoutControlItem29.Location = new System.Drawing.Point(0, 217);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem29.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem29.Text = "鍏ュ簱璐т富ID";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txt_itemId;
+            this.layoutControlItem32.Location = new System.Drawing.Point(828, 31);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem32.Size = new System.Drawing.Size(278, 31);
+            this.layoutControlItem32.Text = "浜у搧ID";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
             // 
             // Root
             // 
@@ -1252,18 +1287,15 @@
             this.layoutControlItem7,
             this.layoutControlItem9,
             this.layoutControlItem10,
-            this.layoutControlItem11,
             this.layoutControlItem12,
             this.layoutControlItem13,
-            this.layoutControlItem14,
             this.layoutControlItem16,
             this.layoutControlItem17,
-            this.layoutControlItem18,
             this.layoutControlItem20,
             this.layoutControlItem21,
-            this.layoutControlItem22,
             this.layoutControlItem24,
             this.layoutControlItem25,
+            this.layoutControlItem33,
             this.layoutControlItem15,
             this.layoutControlItem19,
             this.layoutControlItem23,
@@ -1271,11 +1303,12 @@
             this.layoutControlItem31,
             this.layoutControlItem26,
             this.layoutControlItem30,
-            this.layoutControlItem28,
-            this.layoutControlItem29,
-            this.layoutControlItem33,
-            this.layoutControlItem32,
-            this.layoutControlItem8});
+            this.layoutControlItem22,
+            this.layoutControlItem18,
+            this.layoutControlItem14,
+            this.layoutControlItem11,
+            this.layoutControlItem35,
+            this.layoutControlItem28});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1307,8 +1340,6 @@
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition8.Height = 100D;
             rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
@@ -1317,9 +1348,8 @@
             rowDefinition5,
             rowDefinition6,
             rowDefinition7,
-            rowDefinition8,
-            rowDefinition9});
-            this.Root.Size = new System.Drawing.Size(1126, 303);
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1105, 244);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1327,351 +1357,332 @@
             this.layoutControlItem1.Control = this.txt_orderNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_orderType;
-            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_workOrderQty;
-            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_businessStatusTxt;
-            this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(278, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
             this.layoutControlItem4.Text = "涓氬姟鐘舵��";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_erpProductionOrderNo;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_trackingNo;
-            this.layoutControlItem6.Location = new System.Drawing.Point(276, 31);
+            this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem6.Text = "璁″垝璺熻釜鍙�";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
-            this.layoutControlItem7.Control = this.txt_stockinqty;
-            this.layoutControlItem7.Location = new System.Drawing.Point(552, 31);
+            this.layoutControlItem7.Control = this.txt_yrkQty;
+            this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_itemNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem9.Text = "浜у搧缂栫爜";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_itemName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(276, 62);
+            this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem10.Text = "浜у搧鍚嶇О";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_itemModel;
-            this.layoutControlItem11.Location = new System.Drawing.Point(552, 62);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem11.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_purchaseorderno;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 93);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem12.Text = "閲囪喘璁㈠崟";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_demandOrderNo;
-            this.layoutControlItem13.Location = new System.Drawing.Point(276, 93);
+            this.layoutControlItem13.Location = new System.Drawing.Point(271, 84);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem13.Text = "闇�姹傚崟鎹彿";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_dwName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(552, 93);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem14.Text = "鍗曚綅";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_purchaseorderentryseq;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem16.Text = "閲囪喘鍗曡鍙�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_demandOrderLineNo;
-            this.layoutControlItem17.Location = new System.Drawing.Point(276, 124);
+            this.layoutControlItem17.Location = new System.Drawing.Point(271, 112);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem17.Text = "闇�姹傚崟鎹鍙�";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_storageUpperLimit;
-            this.layoutControlItem18.Location = new System.Drawing.Point(552, 124);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_bomVersion;
-            this.layoutControlItem20.Location = new System.Drawing.Point(0, 155);
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem20.Text = "BOM鐗堟";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_closingPerson;
-            this.layoutControlItem21.Location = new System.Drawing.Point(276, 155);
+            this.layoutControlItem21.Location = new System.Drawing.Point(271, 140);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem21.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem21.Text = "缁撴浜�";
+            this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem21.Text = "缁撴浜哄憳";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_storageLowerLimit;
-            this.layoutControlItem22.Location = new System.Drawing.Point(552, 155);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txt_sourceOrderNo;
-            this.layoutControlItem24.Location = new System.Drawing.Point(0, 186);
+            this.layoutControlItem24.Location = new System.Drawing.Point(0, 168);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem24.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem24.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem24.Text = "婧愬崟缂栧彿";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.txt_closingType;
-            this.layoutControlItem25.Location = new System.Drawing.Point(276, 186);
+            this.layoutControlItem25.Location = new System.Drawing.Point(271, 168);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem25.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem25.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem25.Text = "缁撴绫诲瀷";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.txt_stockownerName;
+            this.layoutControlItem33.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem33.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem33.Text = "鍏ュ簱璐т富";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_estimatedStartTime;
-            this.layoutControlItem15.Location = new System.Drawing.Point(828, 62);
+            this.layoutControlItem15.CustomizationFormText = "Erp棰勮寮�宸�";
+            this.layoutControlItem15.Location = new System.Drawing.Point(813, 28);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem15.Text = "棰勮寮�宸ユ椂闂�";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem15.Text = "Erp棰勮寮�宸�";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_estimatedEndTime;
-            this.layoutControlItem19.Location = new System.Drawing.Point(828, 93);
+            this.layoutControlItem19.Location = new System.Drawing.Point(813, 56);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem19.Text = "棰勮瀹屽伐鏃堕棿";
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem19.Text = "Erp棰勮瀹屽伐";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.txt_planReleaseDate;
-            this.layoutControlItem23.Location = new System.Drawing.Point(828, 124);
+            this.layoutControlItem23.CustomizationFormText = "Erp璁″垝涓嬭揪";
+            this.layoutControlItem23.Location = new System.Drawing.Point(813, 84);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem23.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem23.Text = "璁″垝涓嬭揪鏃堕棿";
+            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem23.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem23.Text = "Erp璁″垝涓嬭揪";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_planConfirmation;
-            this.layoutControlItem27.Location = new System.Drawing.Point(828, 155);
+            this.layoutControlItem27.Location = new System.Drawing.Point(813, 112);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem27.Text = "璁″垝纭鏃堕棿";
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem27.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem27.Text = "Erp璁″垝纭";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.txt_auditDate;
-            this.layoutControlItem31.Location = new System.Drawing.Point(828, 186);
+            this.layoutControlItem31.CustomizationFormText = "Mes瀹℃牳鏃堕棿";
+            this.layoutControlItem31.Location = new System.Drawing.Point(813, 140);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem31.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem31.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem31.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem31.Text = "Mes瀹℃牳鏃堕棿";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.txt_auditor;
-            this.layoutControlItem26.Location = new System.Drawing.Point(828, 217);
+            this.layoutControlItem26.Location = new System.Drawing.Point(813, 168);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem26.Text = "瀹℃牳浜�";
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem26.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem26.Text = "Mes瀹℃牳浜哄憳";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem30
             // 
             this.layoutControlItem30.Control = this.txt_auditStatus;
-            this.layoutControlItem30.Location = new System.Drawing.Point(828, 248);
+            this.layoutControlItem30.Location = new System.Drawing.Point(813, 196);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem30.Size = new System.Drawing.Size(278, 35);
-            this.layoutControlItem30.Text = "瀹℃牳鐘舵��";
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem30.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem30.Text = "Mes瀹℃牳鐘舵��";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_remarks;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 248);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem28.Size = new System.Drawing.Size(552, 35);
-            this.layoutControlItem28.Text = "澶囨敞";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_stockowner;
-            this.layoutControlItem29.Location = new System.Drawing.Point(0, 217);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem29.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem29.Text = "鍏ュ簱璐т富ID";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.txt_stockownerName;
-            this.layoutControlItem33.Location = new System.Drawing.Point(276, 217);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem33.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem33.Text = "鍏ュ簱璐т富";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_itemId;
-            this.layoutControlItem32.Location = new System.Drawing.Point(828, 31);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem32.Size = new System.Drawing.Size(278, 31);
-            this.layoutControlItem32.Text = "浜у搧ID";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_batchNo;
-            this.layoutControlItem8.Location = new System.Drawing.Point(552, 186);
+            this.layoutControlItem8.Location = new System.Drawing.Point(542, 196);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem8.Text = "鎵瑰彿";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_storageLowerLimit;
+            this.layoutControlItem22.Location = new System.Drawing.Point(542, 168);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem22.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_storageUpperLimit;
+            this.layoutControlItem18.Location = new System.Drawing.Point(542, 140);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_dwName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(542, 112);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem14.Text = "鍗曚綅";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_itemModel;
+            this.layoutControlItem11.Location = new System.Drawing.Point(542, 84);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem11.Text = "浜у搧瑙勬牸";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.txt_wrkQty;
+            this.layoutControlItem35.Location = new System.Drawing.Point(542, 56);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem35.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem35.Text = "鏈叆搴撴暟";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1679,7 +1690,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 336);
+            this.tabMx.Size = new System.Drawing.Size(1126, 401);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1688,7 +1699,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 304);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 369);
             this.tabMxPage1.Text = "鏄庣粏";
             // 
             // gcMx1
@@ -1697,7 +1708,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 304);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 369);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1732,10 +1743,8 @@
             this.gvMx1variableLossRate,
             this.gvMx1salesOrderNo,
             this.gvMx1itemNo,
-            this.gvMx1issuingOrg2,
             this.gvMx1ownerType,
             this.gvMx1owner,
-            this.gvMx1supplyingOrg2,
             this.gvMx1fsrctransorgid,
             this.gvMx1fsrctransstockid,
             this.gvMx1fstockstatusid,
@@ -1770,7 +1779,7 @@
             // 
             this.gvMx1workOrderNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1workOrderNo.Caption = "鎶曟枡鍗曞彿";
-            this.gvMx1workOrderNo.FieldName = "workOrderNo";
+            this.gvMx1workOrderNo.FieldName = "tldNo";
             this.gvMx1workOrderNo.MinWidth = 50;
             this.gvMx1workOrderNo.Name = "gvMx1workOrderNo";
             this.gvMx1workOrderNo.Tag = "query_a.WORK_ORDER_NO";
@@ -1899,7 +1908,7 @@
             // 
             this.gvMx1warehouse.AppearanceCell.Options.UseFont = true;
             this.gvMx1warehouse.Caption = "浠撳簱 ";
-            this.gvMx1warehouse.FieldName = "warehouse";
+            this.gvMx1warehouse.FieldName = "warehouseTxt";
             this.gvMx1warehouse.MinWidth = 50;
             this.gvMx1warehouse.Name = "gvMx1warehouse";
             this.gvMx1warehouse.Tag = "query_a.WAREHOUSE";
@@ -2039,18 +2048,6 @@
             this.gvMx1itemNo.VisibleIndex = 23;
             this.gvMx1itemNo.Width = 94;
             // 
-            // gvMx1issuingOrg2
-            // 
-            this.gvMx1issuingOrg2.AppearanceCell.Options.UseFont = true;
-            this.gvMx1issuingOrg2.Caption = "鍙戞枡缁勭粐 ";
-            this.gvMx1issuingOrg2.FieldName = "issuingOrg2";
-            this.gvMx1issuingOrg2.MinWidth = 50;
-            this.gvMx1issuingOrg2.Name = "gvMx1issuingOrg2";
-            this.gvMx1issuingOrg2.Tag = "query_a.ISSUING_ORG_2";
-            this.gvMx1issuingOrg2.Visible = true;
-            this.gvMx1issuingOrg2.VisibleIndex = 24;
-            this.gvMx1issuingOrg2.Width = 94;
-            // 
             // gvMx1ownerType
             // 
             this.gvMx1ownerType.AppearanceCell.Options.UseFont = true;
@@ -2060,7 +2057,7 @@
             this.gvMx1ownerType.Name = "gvMx1ownerType";
             this.gvMx1ownerType.Tag = "query_a.OWNER_TYPE";
             this.gvMx1ownerType.Visible = true;
-            this.gvMx1ownerType.VisibleIndex = 25;
+            this.gvMx1ownerType.VisibleIndex = 24;
             this.gvMx1ownerType.Width = 94;
             // 
             // gvMx1owner
@@ -2071,44 +2068,30 @@
             this.gvMx1owner.MinWidth = 50;
             this.gvMx1owner.Name = "gvMx1owner";
             this.gvMx1owner.Tag = "query_a.OWNER";
-            this.gvMx1owner.Visible = true;
-            this.gvMx1owner.VisibleIndex = 26;
             this.gvMx1owner.Width = 94;
-            // 
-            // gvMx1supplyingOrg2
-            // 
-            this.gvMx1supplyingOrg2.AppearanceCell.Options.UseFont = true;
-            this.gvMx1supplyingOrg2.Caption = "渚涘簲缁勭粐 ";
-            this.gvMx1supplyingOrg2.FieldName = "supplyingOrg2";
-            this.gvMx1supplyingOrg2.MinWidth = 50;
-            this.gvMx1supplyingOrg2.Name = "gvMx1supplyingOrg2";
-            this.gvMx1supplyingOrg2.Tag = "query_a.SUPPLYING_ORG_2";
-            this.gvMx1supplyingOrg2.Visible = true;
-            this.gvMx1supplyingOrg2.VisibleIndex = 27;
-            this.gvMx1supplyingOrg2.Width = 94;
             // 
             // gvMx1fsrctransorgid
             // 
             this.gvMx1fsrctransorgid.AppearanceCell.Options.UseFont = true;
             this.gvMx1fsrctransorgid.Caption = "鎷ㄥ嚭缁勭粐 ";
-            this.gvMx1fsrctransorgid.FieldName = "fsrctransorgid";
+            this.gvMx1fsrctransorgid.FieldName = "bcOrgName";
             this.gvMx1fsrctransorgid.MinWidth = 50;
             this.gvMx1fsrctransorgid.Name = "gvMx1fsrctransorgid";
             this.gvMx1fsrctransorgid.Tag = "query_a.FSRCTRANSORGID";
             this.gvMx1fsrctransorgid.Visible = true;
-            this.gvMx1fsrctransorgid.VisibleIndex = 29;
+            this.gvMx1fsrctransorgid.VisibleIndex = 25;
             this.gvMx1fsrctransorgid.Width = 94;
             // 
             // gvMx1fsrctransstockid
             // 
             this.gvMx1fsrctransstockid.AppearanceCell.Options.UseFont = true;
             this.gvMx1fsrctransstockid.Caption = "鎷ㄥ嚭浠撳簱 ";
-            this.gvMx1fsrctransstockid.FieldName = "fsrctransstockid";
+            this.gvMx1fsrctransstockid.FieldName = "ckName";
             this.gvMx1fsrctransstockid.MinWidth = 50;
             this.gvMx1fsrctransstockid.Name = "gvMx1fsrctransstockid";
             this.gvMx1fsrctransstockid.Tag = "query_a.FSRCTRANSSTOCKID";
             this.gvMx1fsrctransstockid.Visible = true;
-            this.gvMx1fsrctransstockid.VisibleIndex = 30;
+            this.gvMx1fsrctransstockid.VisibleIndex = 26;
             this.gvMx1fsrctransstockid.Width = 94;
             // 
             // gvMx1fstockstatusid
@@ -2120,7 +2103,7 @@
             this.gvMx1fstockstatusid.Name = "gvMx1fstockstatusid";
             this.gvMx1fstockstatusid.Tag = "query_a.FSTOCKSTATUSID";
             this.gvMx1fstockstatusid.Visible = true;
-            this.gvMx1fstockstatusid.VisibleIndex = 31;
+            this.gvMx1fstockstatusid.VisibleIndex = 28;
             this.gvMx1fstockstatusid.Width = 94;
             // 
             // gvMx1fneeddate
@@ -2132,7 +2115,7 @@
             this.gvMx1fneeddate.Name = "gvMx1fneeddate";
             this.gvMx1fneeddate.Tag = "query_a.FNEEDDATE";
             this.gvMx1fneeddate.Visible = true;
-            this.gvMx1fneeddate.VisibleIndex = 32;
+            this.gvMx1fneeddate.VisibleIndex = 29;
             this.gvMx1fneeddate.Width = 94;
             // 
             // gvMx1fmemo
@@ -2144,7 +2127,7 @@
             this.gvMx1fmemo.Name = "gvMx1fmemo";
             this.gvMx1fmemo.Tag = "query_a.FMEMO";
             this.gvMx1fmemo.Visible = true;
-            this.gvMx1fmemo.VisibleIndex = 33;
+            this.gvMx1fmemo.VisibleIndex = 30;
             this.gvMx1fmemo.Width = 94;
             // 
             // gvMx1typeb
@@ -2156,7 +2139,7 @@
             this.gvMx1typeb.Name = "gvMx1typeb";
             this.gvMx1typeb.Tag = "query_a.TYPEB";
             this.gvMx1typeb.Visible = true;
-            this.gvMx1typeb.VisibleIndex = 28;
+            this.gvMx1typeb.VisibleIndex = 27;
             this.gvMx1typeb.Width = 50;
             // 
             // gridColumn8
@@ -2166,7 +2149,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 34;
+            this.gridColumn8.VisibleIndex = 31;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn9
@@ -2176,7 +2159,7 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 35;
+            this.gridColumn9.VisibleIndex = 32;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -2186,7 +2169,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 36;
+            this.gridColumn10.VisibleIndex = 33;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -2196,7 +2179,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 37;
+            this.gridColumn11.VisibleIndex = 34;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -2206,7 +2189,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 38;
+            this.gridColumn12.VisibleIndex = 35;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -2216,7 +2199,7 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 39;
+            this.gridColumn13.VisibleIndex = 36;
             this.gridColumn13.Width = 94;
             // 
             // picCheckBox
@@ -2229,6 +2212,18 @@
             this.picCheckBox.TabIndex = 8;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_remarks;
+            this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem28.Text = "澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
             // 
             // Frm_ProductionOrder
             // 
@@ -2275,7 +2270,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_auditor.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_trackingNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockinqty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_batchNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseorderno.Properties)).EndInit();
@@ -2292,7 +2287,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_bomVersion.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_storageLowerLimit.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_planReleaseDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -2303,18 +2301,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
@@ -2322,17 +2317,19 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2344,7 +2341,6 @@
         private DevExpress.XtraEditors.SplitContainerControl split1;
         private DevExpress.XtraGrid.GridControl gcMain1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_auditStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_orderNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -2392,7 +2388,7 @@
         private DevExpress.XtraEditors.TextEdit txt_auditor;
         private DevExpress.XtraEditors.TextEdit txt_auditStatus;
         private DevExpress.XtraEditors.TextEdit txt_stockowner;
-        private DevExpress.XtraEditors.TextEdit txt_stockinqty;
+        private DevExpress.XtraEditors.TextEdit txt_yrkQty;
         private DevExpress.XtraEditors.TextEdit txt_purchaseorderentryseq;
         private DevExpress.XtraEditors.TextEdit txt_purchaseorderno;
         private DevExpress.XtraEditors.TextEdit txt_remarks;
@@ -2425,16 +2421,12 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
@@ -2466,10 +2458,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1variableLossRate;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1issuingOrg2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerType;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1owner;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyingOrg2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fsrctransorgid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fsrctransstockid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstockstatusid;
@@ -2483,6 +2473,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_wrkQty;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
@@ -2490,11 +2485,14 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3