lu
2025-04-07 95e1ab772866afcd2219c1075c621b893a94b596
卡板
已添加5个文件
已修改6个文件
1978 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs 1073 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
        <add key="WebApiUrl" value="http://192.168.1.145:81/" />
         <add key="WebApiUrl" value="http://localhost:5263/" />
        <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
@@ -37,6 +37,13 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -58,25 +65,73 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_taskNo = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_cusId = new Gs.DevApp.UserControl.UcLookCustomer();
            this.txt_isSource = new DevExpress.XtraEditors.RadioGroup();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_lineType = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_dptId = new Gs.DevApp.UserControl.UcLookDepartment();
            this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_name = new DevExpress.XtraEditors.TextEdit();
            this.txt_dwmc = new DevExpress.XtraEditors.TextEdit();
            this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
            this.txt_daaSumQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_daaSyQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_quantity = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_cusDh = new DevExpress.XtraEditors.TextEdit();
            this.txt_saleDh = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_extDate = new DevExpress.XtraEditors.DateEdit();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.客户名称 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -93,26 +148,59 @@
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
            this.splitMx1.Panel2.SuspendLayout();
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.客户名称)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).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.repositoryItemButtonEdit1)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -380,32 +468,87 @@
            // 
            // splitMx1.Panel2
            // 
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 147;
            this.splitMx1.SplitterPosition = 201;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_orgId);
            this.layoutMx1.Controls.Add(this.txt_taskNo);
            this.layoutMx1.Controls.Add(this.txt_cusId);
            this.layoutMx1.Controls.Add(this.txt_isSource);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_lineType);
            this.layoutMx1.Controls.Add(this.txt_dptId);
            this.layoutMx1.Controls.Add(this.txt_lineNo);
            this.layoutMx1.Controls.Add(this.txt_name);
            this.layoutMx1.Controls.Add(this.txt_dwmc);
            this.layoutMx1.Controls.Add(this.txt_lotNo);
            this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
            this.layoutMx1.Controls.Add(this.txt_remark);
            this.layoutMx1.Controls.Add(this.txt_memo);
            this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
            this.layoutMx1.Controls.Add(this.txt_isZxbg);
            this.layoutMx1.Controls.Add(this.txt_daaSumQty);
            this.layoutMx1.Controls.Add(this.txt_daaSyQty);
            this.layoutMx1.Controls.Add(this.txt_quantity);
            this.layoutMx1.Controls.Add(this.txt_psnQty_1);
            this.layoutMx1.Controls.Add(this.txt_iCount_1);
            this.layoutMx1.Controls.Add(this.txt_cusDh);
            this.layoutMx1.Controls.Add(this.txt_saleDh);
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_itemModel);
            this.layoutMx1.Controls.Add(this.txt_extDate);
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem9});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(713, 530, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 147);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 201);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // txt_orgId
            //
            this.txt_orgId.IsReadly = false;
            this.txt_orgId.Location = new System.Drawing.Point(99, 12);
            this.txt_orgId.Name = "txt_orgId";
            this.txt_orgId.Size = new System.Drawing.Size(180, 24);
            this.txt_orgId.TabIndex = 549;
            //
            // txt_taskNo
            //
            this.txt_taskNo.Location = new System.Drawing.Point(99, 76);
            this.txt_taskNo.Name = "txt_taskNo";
            this.txt_taskNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
            this.txt_taskNo.Size = new System.Drawing.Size(180, 24);
            this.txt_taskNo.StyleController = this.layoutMx1;
            this.txt_taskNo.TabIndex = 546;
            //
            // txt_cusId
            //
            this.txt_cusId.IsReadly = false;
            this.txt_cusId.Location = new System.Drawing.Point(641, 12);
            this.txt_cusId.Name = "txt_cusId";
            this.txt_cusId.Size = new System.Drawing.Size(180, 24);
            this.txt_cusId.TabIndex = 545;
            //
            // txt_isSource
            //
            this.txt_isSource.EditValue = "1";
            this.txt_isSource.Location = new System.Drawing.Point(99, 42);
            this.txt_isSource.Margin = new System.Windows.Forms.Padding(0);
            this.txt_isSource.MaximumSize = new System.Drawing.Size(0, 26);
            this.txt_isSource.Name = "txt_isSource";
            this.txt_isSource.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有工单"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "无工单")});
            this.txt_isSource.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.txt_isSource.Size = new System.Drawing.Size(180, 26);
            this.txt_isSource.StyleController = this.layoutMx1;
            this.txt_isSource.TabIndex = 534;
            // 
            // lbGuid
            // 
@@ -416,84 +559,161 @@
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_lineType
            // txt_dwmc
            // 
            this.txt_lineType.Location = new System.Drawing.Point(360, 75);
            this.txt_lineType.Name = "txt_lineType";
            this.txt_lineType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_lineType.Properties.Items.AddRange(new object[] {
            "手工线",
            "自动线"});
            this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_lineType.Size = new System.Drawing.Size(200, 24);
            this.txt_lineType.StyleController = this.layoutMx1;
            this.txt_lineType.TabIndex = 245;
            this.txt_dwmc.Location = new System.Drawing.Point(641, 108);
            this.txt_dwmc.Name = "txt_dwmc";
            this.txt_dwmc.Properties.Appearance.Options.UseFont = true;
            this.txt_dwmc.Size = new System.Drawing.Size(180, 24);
            this.txt_dwmc.StyleController = this.layoutMx1;
            this.txt_dwmc.TabIndex = 216;
            this.txt_dwmc.Tag = "readonly";
            // 
            // txt_dptId
            // txt_lotNo
            // 
            this.txt_dptId.IsReadly = false;
            this.txt_dptId.Location = new System.Drawing.Point(84, 12);
            this.txt_dptId.Name = "txt_dptId";
            this.txt_dptId.Size = new System.Drawing.Size(200, 24);
            this.txt_dptId.TabIndex = 244;
            //
            // txt_lineNo
            //
            this.txt_lineNo.Location = new System.Drawing.Point(84, 43);
            this.txt_lineNo.Name = "txt_lineNo";
            this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
            this.txt_lineNo.Size = new System.Drawing.Size(200, 24);
            this.txt_lineNo.StyleController = this.layoutMx1;
            this.txt_lineNo.TabIndex = 216;
            this.txt_lineNo.Tag = "";
            //
            // txt_name
            //
            this.txt_name.Location = new System.Drawing.Point(84, 75);
            this.txt_name.Name = "txt_name";
            this.txt_name.Properties.Appearance.Options.UseFont = true;
            this.txt_name.Size = new System.Drawing.Size(200, 24);
            this.txt_name.StyleController = this.layoutMx1;
            this.txt_name.TabIndex = 217;
            this.txt_lotNo.Location = new System.Drawing.Point(370, 140);
            this.txt_lotNo.Name = "txt_lotNo";
            this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
            this.txt_lotNo.Size = new System.Drawing.Size(180, 24);
            this.txt_lotNo.StyleController = this.layoutMx1;
            this.txt_lotNo.TabIndex = 217;
            // 
            // txt_lastupdateDate
            // 
            this.txt_lastupdateDate.Location = new System.Drawing.Point(360, 43);
            this.txt_lastupdateDate.Location = new System.Drawing.Point(912, 44);
            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateDate.Size = new System.Drawing.Size(200, 24);
            this.txt_lastupdateDate.Size = new System.Drawing.Size(181, 24);
            this.txt_lastupdateDate.StyleController = this.layoutMx1;
            this.txt_lastupdateDate.TabIndex = 231;
            this.txt_lastupdateDate.Tag = "readonly";
            // 
            // txt_remark
            // txt_memo
            // 
            this.txt_remark.Location = new System.Drawing.Point(84, 107);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(200, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 219;
            this.txt_memo.Location = new System.Drawing.Point(912, 76);
            this.txt_memo.Name = "txt_memo";
            this.txt_memo.Properties.Appearance.Options.UseFont = true;
            this.txt_memo.Size = new System.Drawing.Size(181, 24);
            this.txt_memo.StyleController = this.layoutMx1;
            this.txt_memo.TabIndex = 219;
            // 
            // txt_lastupdateBy
            // 
            this.txt_lastupdateBy.Location = new System.Drawing.Point(360, 12);
            this.txt_lastupdateBy.Location = new System.Drawing.Point(912, 12);
            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
            this.txt_lastupdateBy.Size = new System.Drawing.Size(200, 24);
            this.txt_lastupdateBy.Size = new System.Drawing.Size(181, 24);
            this.txt_lastupdateBy.StyleController = this.layoutMx1;
            this.txt_lastupdateBy.TabIndex = 228;
            this.txt_lastupdateBy.Tag = "readonly";
            // 
            // txt_isZxbg
            // txt_daaSumQty
            // 
            this.txt_isZxbg.Location = new System.Drawing.Point(288, 107);
            this.txt_isZxbg.Name = "txt_isZxbg";
            this.txt_isZxbg.Properties.Caption = "整线报工";
            this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
            this.txt_isZxbg.StyleController = this.layoutMx1;
            this.txt_isZxbg.TabIndex = 246;
            this.txt_daaSumQty.Location = new System.Drawing.Point(99, 108);
            this.txt_daaSumQty.Name = "txt_daaSumQty";
            this.txt_daaSumQty.Size = new System.Drawing.Size(180, 24);
            this.txt_daaSumQty.StyleController = this.layoutMx1;
            this.txt_daaSumQty.TabIndex = 535;
            this.txt_daaSumQty.Tag = "readonly";
            //
            // txt_daaSyQty
            //
            this.txt_daaSyQty.Location = new System.Drawing.Point(99, 140);
            this.txt_daaSyQty.Name = "txt_daaSyQty";
            this.txt_daaSyQty.Size = new System.Drawing.Size(180, 24);
            this.txt_daaSyQty.StyleController = this.layoutMx1;
            this.txt_daaSyQty.TabIndex = 536;
            this.txt_daaSyQty.Tag = "readonly";
            //
            // txt_quantity
            //
            this.txt_quantity.Location = new System.Drawing.Point(99, 172);
            this.txt_quantity.Name = "txt_quantity";
            this.txt_quantity.Size = new System.Drawing.Size(180, 24);
            this.txt_quantity.StyleController = this.layoutMx1;
            this.txt_quantity.TabIndex = 537;
            //
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(370, 172);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Size = new System.Drawing.Size(180, 24);
            this.txt_psnQty_1.StyleController = this.layoutMx1;
            this.txt_psnQty_1.TabIndex = 538;
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(641, 172);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Size = new System.Drawing.Size(180, 24);
            this.txt_iCount_1.StyleController = this.layoutMx1;
            this.txt_iCount_1.TabIndex = 539;
            //
            // txt_cusDh
            //
            this.txt_cusDh.Location = new System.Drawing.Point(641, 44);
            this.txt_cusDh.Name = "txt_cusDh";
            this.txt_cusDh.Size = new System.Drawing.Size(180, 24);
            this.txt_cusDh.StyleController = this.layoutMx1;
            this.txt_cusDh.TabIndex = 540;
            //
            // txt_saleDh
            //
            this.txt_saleDh.Location = new System.Drawing.Point(641, 76);
            this.txt_saleDh.Name = "txt_saleDh";
            this.txt_saleDh.Size = new System.Drawing.Size(180, 24);
            this.txt_saleDh.StyleController = this.layoutMx1;
            this.txt_saleDh.TabIndex = 541;
            //
            // txt_itemId
            //
            this.txt_itemId.Location = new System.Drawing.Point(370, 12);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
            this.txt_itemId.Size = new System.Drawing.Size(180, 24);
            this.txt_itemId.StyleController = this.layoutMx1;
            this.txt_itemId.TabIndex = 542;
            //
            // txt_itemName
            //
            this.txt_itemName.Location = new System.Drawing.Point(370, 76);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Size = new System.Drawing.Size(180, 24);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 543;
            this.txt_itemName.Tag = "readonly";
            //
            // txt_itemModel
            //
            this.txt_itemModel.Location = new System.Drawing.Point(370, 108);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Size = new System.Drawing.Size(180, 24);
            this.txt_itemModel.StyleController = this.layoutMx1;
            this.txt_itemModel.TabIndex = 544;
            this.txt_itemModel.Tag = "readonly";
            //
            // txt_extDate
            //
            this.txt_extDate.EditValue = null;
            this.txt_extDate.Location = new System.Drawing.Point(641, 140);
            this.txt_extDate.Name = "txt_extDate";
            this.txt_extDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_extDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_extDate.Size = new System.Drawing.Size(180, 24);
            this.txt_extDate.StyleController = this.layoutMx1;
            this.txt_extDate.TabIndex = 547;
            //
            // txt_itemNo
            //
            this.txt_itemNo.Location = new System.Drawing.Point(370, 44);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 548;
            this.txt_itemNo.Tag = "readonly";
            // 
            // layoutControlItem9
            // 
@@ -512,14 +732,27 @@
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem7,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem8});
            this.layoutControlItem12,
            this.layoutControlItem1,
            this.layoutControlItem11,
            this.layoutControlItem21,
            this.layoutControlItem15,
            this.layoutControlItem19,
            this.layoutControlItem8,
            this.layoutControlItem20,
            this.客户名称,
            this.layoutControlItem17,
            this.layoutControlItem18,
            this.layoutControlItem2,
            this.layoutControlItem16,
            this.layoutControlItem13,
            this.layoutControlItem14,
            this.layoutControlItem3,
            this.layoutControlItem10,
            this.layoutControlItem4});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -543,106 +776,505 @@
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1126, 147);
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1105, 212);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
            // layoutControlItem7
            // 
            this.layoutControlItem1.Control = this.txt_dptId;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Text = "所在部门";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_lineNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Text = "产线编号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_name;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 63);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem3.Text = "产线名称";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_remark;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 95);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem4.Text = "备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem7.Control = this.txt_itemId;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem7.Text = "选择产品";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_lastupdateBy;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem5.Text = "更新者";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem5.Text = "最后更新人";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_lastupdateDate;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(813, 32);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem6.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem6.Text = "更新时间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem7
            // layoutControlItem12
            // 
            this.layoutControlItem7.Control = this.txt_lineType;
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 63);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Text = "线体类别";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem12.Control = this.txt_daaSumQty;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem12.Text = "工单总量";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem1
            //
            this.layoutControlItem1.Control = this.txt_taskNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem1.Text = "选择工单";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_isSource;
            this.layoutControlItem11.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem11.Text = "选择来源";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.txt_orgId;
            this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem21.Text = "选择组织";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_psnQty_1;
            this.layoutControlItem15.Location = new System.Drawing.Point(271, 160);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem15.Text = "内包装数量";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_itemModel;
            this.layoutControlItem19.Location = new System.Drawing.Point(271, 96);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem19.Text = "规格型号";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isZxbg;
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 95);
            this.layoutControlItem8.Control = this.txt_itemName;
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem8.Text = "整线报工";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem8.Text = "产品名称";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
            // 
            // Frm_MesWorkshopLine
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_itemNo;
            this.layoutControlItem20.Location = new System.Drawing.Point(271, 32);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem20.Text = "产品编码";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
            //
            // å®¢æˆ·åç§°
            //
            this.客户名称.Control = this.txt_cusId;
            this.客户名称.Location = new System.Drawing.Point(542, 0);
            this.客户名称.Name = "客户名称";
            this.客户名称.OptionsTableLayoutItem.ColumnIndex = 2;
            this.客户名称.Size = new System.Drawing.Size(271, 32);
            this.客户名称.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_cusDh;
            this.layoutControlItem17.Location = new System.Drawing.Point(542, 32);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem17.Text = "客户单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_saleDh;
            this.layoutControlItem18.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem18.Text = "销售单号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_dwmc;
            this.layoutControlItem2.Location = new System.Drawing.Point(542, 96);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem2.Text = "单位";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.txt_iCount_1;
            this.layoutControlItem16.Location = new System.Drawing.Point(542, 160);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem16.Text = "打印数量";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_daaSyQty;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem13.Text = "剩余数量";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_quantity;
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 160);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem14.Text = "生产数量";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_lotNo;
            this.layoutControlItem3.Location = new System.Drawing.Point(271, 128);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem3.Text = "生产批次";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_extDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(542, 128);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem10.Text = "生产日期";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_memo;
            this.layoutControlItem4.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem4.Text = "标记";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            //
            // tabMx
            //
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            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, 357);
            this.tabMx.TabIndex = 4;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
            //
            // tabMxPage1
            //
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
            this.tabMxPage1.Text = "流水码明细";
            //
            // gcMx1
            //
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 325);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            //
            // gvMx1
            //
            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx1.Appearance.Row.Options.UseFont = true;
            this.gvMx1.ColumnPanelRowHeight = 50;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2guid,
            this.gridColumn20,
            this.gridColumn19,
            this.gvMx2itemBarcode,
            this.gvMx2quantity,
            this.gvMx2unit,
            this.gridColumn18,
            this.gvMx2itemSname,
            this.gridColumn17,
            this.gvMx2createBy,
            this.gvMx2createDate,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn30,
            this.gridColumn31,
            this.gridColumn32,
            this.gvBtnAlawys});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gvMx2guid
            //
            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
            this.gvMx2guid.Caption = "guid ";
            this.gvMx2guid.FieldName = "guid";
            this.gvMx2guid.MinWidth = 50;
            this.gvMx2guid.Name = "gvMx2guid";
            this.gvMx2guid.Tag = "query_a.guid";
            this.gvMx2guid.Width = 94;
            //
            // gridColumn20
            //
            this.gridColumn20.Caption = "报工标识";
            this.gridColumn20.FieldName = "isBg";
            this.gridColumn20.MaxWidth = 50;
            this.gridColumn20.MinWidth = 50;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 0;
            this.gridColumn20.Width = 50;
            //
            // gridColumn19
            //
            this.gridColumn19.Caption = "入库标识";
            this.gridColumn19.FieldName = "isRk";
            this.gridColumn19.MaxWidth = 50;
            this.gridColumn19.MinWidth = 50;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 1;
            this.gridColumn19.Width = 50;
            //
            // gvMx2itemBarcode
            //
            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemBarcode.Caption = "物料条码 ";
            this.gvMx2itemBarcode.FieldName = "itemBarcode";
            this.gvMx2itemBarcode.MinWidth = 50;
            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
            this.gvMx2itemBarcode.Visible = true;
            this.gvMx2itemBarcode.VisibleIndex = 2;
            this.gvMx2itemBarcode.Width = 94;
            //
            // gvMx2quantity
            //
            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx2quantity.Caption = "数量 ";
            this.gvMx2quantity.FieldName = "quantity";
            this.gvMx2quantity.MinWidth = 50;
            this.gvMx2quantity.Name = "gvMx2quantity";
            this.gvMx2quantity.Tag = "query_a.QUANTITY";
            this.gvMx2quantity.Visible = true;
            this.gvMx2quantity.VisibleIndex = 3;
            this.gvMx2quantity.Width = 94;
            //
            // gvMx2unit
            //
            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
            this.gvMx2unit.Caption = "单位 ";
            this.gvMx2unit.FieldName = "dwName";
            this.gvMx2unit.MinWidth = 50;
            this.gvMx2unit.Name = "gvMx2unit";
            this.gvMx2unit.Tag = "query_a.UNIT";
            this.gvMx2unit.Visible = true;
            this.gvMx2unit.VisibleIndex = 4;
            this.gvMx2unit.Width = 94;
            //
            // gridColumn18
            //
            this.gridColumn18.Caption = "物料编码";
            this.gridColumn18.FieldName = "itemNo";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 5;
            this.gridColumn18.Width = 94;
            //
            // gvMx2itemSname
            //
            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemSname.Caption = "物料名称 ";
            this.gvMx2itemSname.FieldName = "itemName";
            this.gvMx2itemSname.MinWidth = 50;
            this.gvMx2itemSname.Name = "gvMx2itemSname";
            this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
            this.gvMx2itemSname.Visible = true;
            this.gvMx2itemSname.VisibleIndex = 6;
            this.gvMx2itemSname.Width = 94;
            //
            // gridColumn17
            //
            this.gridColumn17.Caption = "物料规格";
            this.gridColumn17.FieldName = "itemModel";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 7;
            this.gridColumn17.Width = 94;
            //
            // gvMx2createBy
            //
            this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
            this.gvMx2createBy.Caption = "创建人 ";
            this.gvMx2createBy.FieldName = "createBy";
            this.gvMx2createBy.MinWidth = 50;
            this.gvMx2createBy.Name = "gvMx2createBy";
            this.gvMx2createBy.Tag = "query_a.CREATE_BY";
            this.gvMx2createBy.Visible = true;
            this.gvMx2createBy.VisibleIndex = 8;
            this.gvMx2createBy.Width = 94;
            //
            // gvMx2createDate
            //
            this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
            this.gvMx2createDate.Caption = "创建时间 ";
            this.gvMx2createDate.FieldName = "createDate";
            this.gvMx2createDate.MinWidth = 50;
            this.gvMx2createDate.Name = "gvMx2createDate";
            this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
            this.gvMx2createDate.Visible = true;
            this.gvMx2createDate.VisibleIndex = 9;
            this.gvMx2createDate.Width = 94;
            //
            // gridColumn28
            //
            this.gridColumn28.Caption = "报工人";
            this.gridColumn28.FieldName = "bgYg";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 10;
            this.gridColumn28.Width = 94;
            //
            // gridColumn29
            //
            this.gridColumn29.Caption = "报工时间";
            this.gridColumn29.FieldName = "bgTime";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 11;
            this.gridColumn29.Width = 94;
            //
            // gridColumn30
            //
            this.gridColumn30.Caption = "入库人";
            this.gridColumn30.FieldName = "rkUser";
            this.gridColumn30.MinWidth = 25;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 12;
            this.gridColumn30.Width = 94;
            //
            // gridColumn31
            //
            this.gridColumn31.Caption = "入库日期";
            this.gridColumn31.FieldName = "rkDate";
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 13;
            this.gridColumn31.Width = 94;
            //
            // gridColumn32
            //
            this.gridColumn32.Caption = "入库位";
            this.gridColumn32.FieldName = "rkPositon";
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 14;
            this.gridColumn32.Width = 94;
            //
            // gvBtnAlawys
            //
            this.gvBtnAlawys.Caption = "移出";
            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 15;
            this.gvBtnAlawys.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // Frm_BoxCode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesWorkshopLine";
            this.Text = "线体管理";
            this.Name = "Frm_BoxCode";
            this.Text = "托板码管理";
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
@@ -657,27 +1289,60 @@
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
            this.splitMx1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
            this.splitMx1.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.客户名称)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).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.repositoryItemButtonEdit1)).EndInit();
            this.ResumeLayout(false);
        }
@@ -702,26 +1367,74 @@
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraEditors.ComboBoxEdit txt_lineType;
        private UserControl.UcLookDepartment txt_dptId;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
        private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
        private DevExpress.XtraEditors.TextEdit txt_remark;
        private DevExpress.XtraEditors.TextEdit txt_name;
        private DevExpress.XtraEditors.TextEdit txt_lineNo;
        private DevExpress.XtraEditors.TextEdit txt_memo;
        private DevExpress.XtraEditors.TextEdit txt_lotNo;
        private DevExpress.XtraEditors.TextEdit txt_dwmc;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.CheckEdit txt_isZxbg;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.RadioGroup txt_isSource;
        private DevExpress.XtraEditors.TextEdit txt_daaSumQty;
        private DevExpress.XtraEditors.TextEdit txt_daaSyQty;
        private DevExpress.XtraEditors.TextEdit txt_quantity;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_cusDh;
        private DevExpress.XtraEditors.TextEdit txt_saleDh;
        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private UserControl.UcLookCustomer txt_cusId;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraEditors.ButtonEdit txt_taskNo;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
        private DevExpress.XtraGrid.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.DateEdit txt_extDate;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private UserControl.UcLookOrg txt_orgId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem å®¢æˆ·åç§°;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
    }
}
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
@@ -1,15 +1,10 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,7 +12,7 @@
{
    public partial class Frm_BoxCode : DevExpress.XtraEditors.XtraForm
    {
        string _webServiceName = "MesWorkshopLineManager/";
        string _webServiceName = "Box/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Frm_BoxCode()
        {
@@ -43,12 +38,57 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            this.txt_dptId.getSuppler("");
            txt_itemId.Click += (s, e) =>
            {
                string _orgId = txt_orgId.GetId();
                var frm = new SelectBoxItem(_orgId);
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        var lst = new List<dynamic>();
                        lst = ee.DynamicList;
                        txt_itemId.Text = lst[0].itemId;
                        txt_itemModel.Text = lst[0].itemModel;
                        txt_itemName.Text = lst[0].itemName;
                        txt_itemNo.Text = lst[0].itemNo;
                        txt_lotNo.Text = lst[0].gdbh;
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
            txt_taskNo.Click += (s, e) =>
            {
                string _orgId = txt_orgId.GetId();
                var frm = new SelectBoxDaa(_orgId);
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        var lst = new List<dynamic>();
                        lst = ee.DynamicList;
                        txt_itemId.Text = lst[0].itemId;
                        txt_itemModel.Text = lst[0].itemModel;
                        txt_itemName.Text = lst[0].itemName;
                        txt_itemNo.Text = lst[0].itemNo;
                        txt_lotNo.Text = lst[0].gdbh;
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            await Task.Delay(100);
            getPageList(1);
        }
@@ -104,7 +144,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_lineNo, gridView1, "lineNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_dwmc, gridView1, "lineNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
@@ -166,7 +206,7 @@
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_name, gridView1);
                lbGuid, txt_lotNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
@@ -201,39 +241,73 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_dptId.GetId().Trim()))
            string _txt_orgId = txt_orgId.GetId();
            string _txt_taskNo = txt_taskNo.Text.Trim();
            string _txt_itemId = txt_itemId.Text.Trim();
            string _txt_lotNo = txt_lotNo.Text.Trim();
            string _txt_cusId = txt_cusId.GetId();
            string _txt_cusDh = txt_cusDh.Text.Trim();
            string _txt_saleDh = txt_saleDh.Text.Trim();
            string _txt_memo = txt_memo.Text.Trim();
            string _txt_extDate = txt_extDate.Text;
            string _txt_quantity = txt_quantity.Text.Trim();
            string _txt_psnQty_1 = txt_psnQty_1.Text.Trim();
            string _txt_iCount_1 = txt_iCount_1.Text.Trim();
            if (string.IsNullOrEmpty(_txt_orgId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择所在部门!");
                txt_dptId.Focus();
                Gs.DevApp.ToolBox.MsgHelper.Warning("组织不能为空!");
                txt_orgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineNo.Text.Trim()))
            if (txt_isSource.SelectedIndex == 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线编号不能为空!");
                txt_lineNo.Focus();
                if (_txt_taskNo.Trim().Length <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单!");
                    txt_taskNo.Focus();
                    return;
                }
            }
            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产品ID不能为空!");
                txt_itemId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_name.Text.Trim()))
            if (string.IsNullOrEmpty(_txt_quantity.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线名称不能为空!");
                txt_name.Focus();
                Gs.DevApp.ToolBox.MsgHelper.Warning("生产数量不能为空!");
                txt_quantity.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineType.Text.Trim()))
            if (string.IsNullOrEmpty(_txt_psnQty_1.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线类别不能为空!");
                txt_lineType.Focus();
                Gs.DevApp.ToolBox.MsgHelper.Warning("内包装数量不能为空!");
                txt_psnQty_1.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_iCount_1.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("打印数量不能为空!");
                txt_iCount_1.Focus();
                return;
            }
            var _obj = new
            {
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                DptId = txt_dptId.GetId(),
                Name = txt_name.Text.Trim(),
                LineNo = txt_lineNo.Text.Trim(),
                Remark = txt_remark.Text.Trim(),
                LineType = txt_lineType.Text.Trim(),
                isZxbg = txt_isZxbg.Checked
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                orgId = _txt_orgId,
                taskNo = _txt_taskNo,
                itemId = _txt_itemId,
                lotNo = _txt_lotNo,
                cusId = _txt_cusId,
                cusDh = _txt_cusDh,
                saleDh = _txt_saleDh,
                memo = _txt_memo,
                extDate = _txt_extDate,
                //
                quantity = _txt_quantity,
                psnQty_1 = _txt_psnQty_1,
                iCount_1 = _txt_iCount_1,
            };
            try
            {
@@ -242,7 +316,7 @@
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                    toolBarMenu1.currentAction = "";
DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
namespace Gs.DevApp.DevFrm.BarCode
{
    partial class SelectBoxDaa
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.SuspendLayout();
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMain.Size = new System.Drawing.Size(581, 489);
            this.gcMain.TabIndex = 3;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn7,
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn6,
            this.gv_Btn});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_Btn
            //
            this.gv_Btn.Caption = "选择";
            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 6;
            this.gv_Btn.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "选择", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "产线";
            this.gridColumn1.FieldName = "lineName";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "工单编号";
            this.gridColumn2.FieldName = "gdbh";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "产品ID";
            this.gridColumn3.FieldName = "itemId";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "产品编码";
            this.gridColumn4.FieldName = "itemNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "产品名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "规格型号";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "主键Guid";
            this.gridColumn7.FieldName = "guid";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            //
            // SelectFqcItem
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(581, 489);
            this.Controls.Add(this.gcMain);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "SelectFqcItem";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择组织";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
    }
}
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,103 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.BarCode
{
    public partial class SelectBoxDaa : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "FqcManager/";
        string orgId = "";
        public SelectBoxDaa(string _orgIdId)
        {
            InitializeComponent();
            this.orgId = _orgIdId;
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                lineId = this.orgId
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                   _webServiceName + "SelectFqcItem", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gridView1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gridView1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (string.IsNullOrEmpty(mxGuid))
                {
                    return;
                }
                var list = new List<dynamic>();
                list.Add(new
                {
                    guid = dr["guid"].ToString(),
                    itemId = dr["itemId"].ToString(),
                    itemName = dr["itemName"].ToString(),
                    itemNo = dr["itemNo"].ToString(),
                    itemModel = dr["itemModel"].ToString(),
                    gdbh = dr["gdbh"].ToString(),
                });
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
                Close();
            }
        }
        /// <summary>
        ///     é€‰æ‹©åŽçš„回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
    }
}
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
namespace Gs.DevApp.DevFrm.BarCode
{
    partial class SelectBoxItem
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.SuspendLayout();
            //
            // gcMain
            //
            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain.Location = new System.Drawing.Point(0, 0);
            this.gcMain.MainView = this.gridView1;
            this.gcMain.Name = "gcMain";
            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMain.Size = new System.Drawing.Size(581, 489);
            this.gcMain.TabIndex = 3;
            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
            //
            // gridView1
            //
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn7,
            this.gridColumn1,
            this.gridColumn2,
            this.gridColumn3,
            this.gridColumn4,
            this.gridColumn5,
            this.gridColumn6,
            this.gv_Btn});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gv_Btn
            //
            this.gv_Btn.Caption = "选择";
            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gv_Btn.MinWidth = 25;
            this.gv_Btn.Name = "gv_Btn";
            this.gv_Btn.Visible = true;
            this.gv_Btn.VisibleIndex = 6;
            this.gv_Btn.Width = 94;
            //
            // repositoryItemButtonEdit1
            //
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "选择", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "产线";
            this.gridColumn1.FieldName = "lineName";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.Width = 94;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "工单编号";
            this.gridColumn2.FieldName = "gdbh";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.Width = 94;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "产品ID";
            this.gridColumn3.FieldName = "itemId";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "产品编码";
            this.gridColumn4.FieldName = "itemNo";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 4;
            this.gridColumn4.Width = 94;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "产品名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 5;
            this.gridColumn5.Width = 94;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "规格型号";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "主键Guid";
            this.gridColumn7.FieldName = "guid";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            //
            // SelectFqcItem
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(581, 489);
            this.Controls.Add(this.gcMain);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
            this.MinimizeBox = false;
            this.Name = "SelectFqcItem";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择组织";
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
    }
}
DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.BarCode
{
    public partial class SelectBoxItem : DevExpress.XtraEditors.XtraForm
    {
        private readonly string _webServiceName = "FqcManager/";
        string orgId = "";
        public SelectBoxItem(string _orgIdId)
        {
            InitializeComponent();
            this.orgId = _orgIdId;
            getPageList(1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
        }
        /// <summary>
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            var _obj = new
            {
                currentPage = curPage,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                lineId = this.orgId
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                   _webServiceName + "SelectFqcItem", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain.BindingContext = new BindingContext();
                    if (dt.Rows.Count > 0)
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gridView1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gridView1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (string.IsNullOrEmpty(mxGuid))
                {
                    return;
                }
                var list = new List<dynamic>();
                list.Add(new
                {
                    guid = dr["guid"].ToString(),
                    itemId = dr["itemId"].ToString(),
                    itemName = dr["itemName"].ToString(),
                    itemNo = dr["itemNo"].ToString(),
                    itemModel = dr["itemModel"].ToString(),
                    gdbh = dr["gdbh"].ToString(),
                });
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
                Close();
            }
        }
        /// <summary>
        ///     é€‰æ‹©åŽçš„回调事件
        /// </summary>
        public event EventHandler<UpdateParentEventArgs> UpdateParent;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -43,7 +43,7 @@
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            await Task.Delay(100);
            getPageList(1);
        }
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,13 +1,9 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Windows.Forms;
using DevExpress.Utils;
using DevExpress.Utils.About;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -411,6 +407,7 @@
            dataTable.Rows.Add("IPQCYC(IPQC异常)");
            dataTable.Rows.Add("FQCYC(FQC异常)");
            dataTable.Rows.Add("ZSM(追溯码)");
            dataTable.Rows.Add("TB(托板码)");
            txt_docCode.Properties.DataSource = dataTable;
            txt_docCode.Properties.DisplayMember = "docCode"; // æ˜¾ç¤ºçš„列
            txt_docCode.Properties.ValueMember = "docCode"; // å®žé™…值的列
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -188,6 +188,18 @@
    <Compile Include="DevFrm\BarCode\Frm_BoxCode.Designer.cs">
      <DependentUpon>Frm_BoxCode.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\BarCode\SelectBoxDaa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\BarCode\SelectBoxDaa.Designer.cs">
      <DependentUpon>SelectBoxDaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\BarCode\SelectBoxItem.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\BarCode\SelectBoxItem.Designer.cs">
      <DependentUpon>SelectBoxItem.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\BasicData\Frm_Customer.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -1153,6 +1165,9 @@
    <Compile Include="XtraForm1.Designer.cs">
      <DependentUpon>XtraForm1.cs</DependentUpon>
    </Compile>
    <EmbeddedResource Include="DevFrm\BarCode\Frm_BoxCode.resx">
      <DependentUpon>Frm_BoxCode.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
      <DependentUpon>Frm_Customer.cs</DependentUpon>
    </EmbeddedResource>