bug
lu
2 天以前 a8d37812edaf003fe6ab9cd90c5b223622635791
bug
已修改10个文件
525 ■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs 303 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/App.config
@@ -35,9 +35,9 @@
    </assemblyBinding>
  </runtime>
  <appSettings>
    <add key="WebApiUrl" value="http://localhost:5263/" />
    <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
    <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
    <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/BasicData/Frm_MesItems.Designer.cs
@@ -69,6 +69,7 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -277,6 +278,7 @@
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn5,
            this.gridColumn9});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
@@ -587,6 +589,16 @@
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 19;
            this.gridColumn8.Width = 94;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "提前到货天数";
            this.gridColumn5.FieldName = "bz10";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 22;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn9
            // 
@@ -1289,5 +1301,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
@@ -1,14 +1,6 @@
using DevExpress.XtraEditors;
using Gs.DevApp.ToolBox;
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.BasicData
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -71,14 +71,14 @@
            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = 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.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -107,14 +107,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).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.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            this.SuspendLayout();
            // 
@@ -286,7 +286,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 5;
            this.gv_createBy.VisibleIndex = 6;
            this.gv_createBy.Width = 63;
            // 
            // gv_createDate
@@ -299,7 +299,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 6;
            this.gv_createDate.VisibleIndex = 7;
            this.gv_createDate.Width = 180;
            // 
            // gv_lastupdateBy
@@ -312,7 +312,7 @@
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 7;
            this.gv_lastupdateBy.VisibleIndex = 8;
            this.gv_lastupdateBy.Width = 63;
            // 
            // gv_lastupdateDate
@@ -325,7 +325,7 @@
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 8;
            this.gv_lastupdateDate.VisibleIndex = 9;
            this.gv_lastupdateDate.Width = 180;
            // 
            // gv_lineType
@@ -342,12 +342,14 @@
            // gv_isZxbg
            // 
            this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
            this.gv_isZxbg.Caption = "整线报工";
            this.gv_isZxbg.Caption = "过站时强制采集数据";
            this.gv_isZxbg.FieldName = "isZxbg";
            this.gv_isZxbg.MinWidth = 50;
            this.gv_isZxbg.Name = "gv_isZxbg";
            this.gv_isZxbg.OptionsColumn.AllowEdit = false;
            this.gv_isZxbg.Tag = "query_a.is_zxbg";
            this.gv_isZxbg.Visible = true;
            this.gv_isZxbg.VisibleIndex = 5;
            this.gv_isZxbg.Width = 50;
            // 
            // gridColumn2
@@ -357,7 +359,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 9;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn3
@@ -420,7 +422,8 @@
            this.layoutMx1.Controls.Add(this.txt_isZxbg);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem9});
            this.layoutControlItem9,
            this.layoutControlItem7});
            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);
@@ -440,7 +443,7 @@
            // 
            // txt_lineType
            // 
            this.txt_lineType.Location = new System.Drawing.Point(360, 75);
            this.txt_lineType.Location = new System.Drawing.Point(636, 107);
            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)});
@@ -491,7 +494,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(84, 107);
            this.txt_remark.Location = new System.Drawing.Point(360, 75);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -510,7 +513,7 @@
            // 
            // txt_isZxbg
            // 
            this.txt_isZxbg.Location = new System.Drawing.Point(288, 107);
            this.txt_isZxbg.Location = new System.Drawing.Point(12, 107);
            this.txt_isZxbg.Name = "txt_isZxbg";
            this.txt_isZxbg.Properties.Caption = "过站时强制采集数据";
            this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
@@ -529,6 +532,17 @@
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            // 
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_lineType;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 95);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Text = "线体类别";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -537,10 +551,9 @@
            this.layoutControlItem1,
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem4,
            this.layoutControlItem8});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
@@ -602,16 +615,6 @@
            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);
            //
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_lastupdateBy;
@@ -633,23 +636,22 @@
            this.layoutControlItem6.Text = "更新时间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // layoutControlItem4
            // 
            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.layoutControlItem4.Control = this.txt_remark;
            this.layoutControlItem4.Location = new System.Drawing.Point(276, 63);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem4.Text = "备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isZxbg;
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 95);
            this.layoutControlItem8.Location = new System.Drawing.Point(0, 95);
            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 = "过站时强制采集数据";
@@ -691,14 +693,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).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.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            this.ResumeLayout(false);
@@ -737,15 +739,15 @@
        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.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -122,11 +122,11 @@
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -198,25 +198,25 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_dptId.GetId().Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择所在部门!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择所在部门!");
                txt_dptId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineNo.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线编号不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("产线编号不能为空!");
                txt_lineNo.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_name.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线名称不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("产线名称不能为空!");
                txt_name.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_lineType.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线类别不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("产线类别不能为空!");
                txt_lineType.Focus();
                return;
            }
@@ -234,19 +234,23 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -257,7 +261,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_no",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
@@ -291,7 +295,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -114,6 +114,7 @@
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -821,6 +822,7 @@
            // 
            this.gvMx1.Appearance.Row.Options.UseFont = true;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn2,
            this.gridColumn12,
            this.gvMx2itemNo,
            this.gridColumn5,
@@ -895,13 +897,13 @@
            // gvMx2remark
            // 
            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
            this.gvMx2remark.Caption = "申请备注";
            this.gvMx2remark.Caption = "备注";
            this.gvMx2remark.FieldName = "remark";
            this.gvMx2remark.Name = "gvMx2remark";
            this.gvMx2remark.OptionsColumn.ReadOnly = true;
            this.gvMx2remark.Tag = "query_a.remark";
            this.gvMx2remark.Visible = true;
            this.gvMx2remark.VisibleIndex = 4;
            this.gvMx2remark.VisibleIndex = 5;
            this.gvMx2remark.Width = 94;
            // 
            // gvMx2itemOutId
@@ -921,7 +923,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 5;
            this.gridColumn14.VisibleIndex = 6;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -931,7 +933,7 @@
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 6;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 94;
            // 
            // xtraTabPage3
@@ -1050,7 +1052,7 @@
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 10;
            this.gridColumn16.VisibleIndex = 6;
            this.gridColumn16.Width = 94;
            // 
            // gridColumn17
@@ -1060,7 +1062,7 @@
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 11;
            this.gridColumn17.VisibleIndex = 7;
            this.gridColumn17.Width = 94;
            // 
            // picCheckBox
@@ -1081,6 +1083,17 @@
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.Size = new System.Drawing.Size(138, 73);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "单位";
            this.gridColumn2.FieldName = "kcUnit";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.OptionsColumn.ReadOnly = true;
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.Width = 94;
            // 
            // Frm_MesYanTui
            // 
@@ -1229,5 +1242,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
    }
}
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -21,9 +21,6 @@
        {
            InitializeComponent();
            strType = _strType;
            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            tlMenu.IndicatorWidth = 50;
            tlMenu.CustomDrawNodeIndicator += (s, ee) =>
            {
@@ -88,11 +85,11 @@
                            tlMenu.DeleteNode(tlMenu.FocusedNode);
                        }
                        else
                            ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                            ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                        ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
                    }
                }
            };
@@ -146,32 +143,10 @@
                    toolStripMenuItemAdd.Visible = false;
                    toolStripMenuItemEdt.Visible = false;
                    toolStripMenuItemDel.Visible = false;
                    toolStripMenuItemRoot.Visible = true;
                    toolStripMenuItemRoot.Visible = false;//2025/07//11改为不增加主项目了
                    cms1.Show(tlMenu, e.Location);
                }
            }
        }
        /// <summary>
        /// 查询事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该窗体不支持查询,若想更新页面,请点击 刷新");
        }
        /// <summary>
        /// 刷新事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            _filterList.Clear();
            getPageList(1);
        }
        /// <summary>
        /// 
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -59,19 +59,19 @@
        {
            if (string.IsNullOrEmpty(txt_defectCode.Text))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("编号不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("编号不能为空!");
                txt_defectCode.Focus();
                return;
            }
            if (txt_sType.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("类型不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("类型不能为空!");
                txt_sType.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_defectName.Text))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("名称不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("名称不能为空!");
                txt_defectName.Focus();
                return;
            }
@@ -89,16 +89,19 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = "" });
                    Close();
                }
                else
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -155,11 +158,11 @@
                    txt_defectCode.Text = dy.maxNo;
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -29,7 +29,6 @@
        private void InitializeComponent()
        {
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
@@ -38,12 +37,22 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.lb_qtckdcgy = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtckdllr = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtkg = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtrkdcgy = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtrkdysy = new DevExpress.XtraEditors.LabelControl();
            this.txt_qtrkdysy = new DevExpress.XtraEditors.TextEdit();
            this.txt_qtrkdcgy = new DevExpress.XtraEditors.TextEdit();
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            this.txt_qtkg = new DevExpress.XtraEditors.CheckEdit();
            this.txt_qtckdllr = new DevExpress.XtraEditors.TextEdit();
            this.txt_qtckdcgy = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -51,16 +60,7 @@
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_qtrkdysy = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtrkdcgy = new DevExpress.XtraEditors.LabelControl();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_qtkg = new DevExpress.XtraEditors.LabelControl();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_qtckdllr = new DevExpress.XtraEditors.LabelControl();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_qtckdcgy = new DevExpress.XtraEditors.LabelControl();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
            this.splitContainerControl1.Panel1.SuspendLayout();
@@ -73,6 +73,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtkg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdllr.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -80,11 +85,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
            this.groupControl1.SuspendLayout();
            this.SuspendLayout();
            // 
            // splitContainerControl1
@@ -96,7 +98,7 @@
            // 
            // splitContainerControl1.Panel1
            // 
            this.splitContainerControl1.Panel1.Controls.Add(this.layoutControl1);
            this.splitContainerControl1.Panel1.Controls.Add(this.groupControl1);
            this.splitContainerControl1.Panel1.Text = "Panel1";
            // 
            // splitContainerControl1.Panel2
@@ -104,7 +106,7 @@
            this.splitContainerControl1.Panel2.Text = "Panel2";
            this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitContainerControl1.Size = new System.Drawing.Size(757, 533);
            this.splitContainerControl1.SplitterPosition = 250;
            this.splitContainerControl1.SplitterPosition = 359;
            this.splitContainerControl1.TabIndex = 0;
            // 
            // layoutControl1
@@ -127,34 +129,79 @@
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11});
            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
            this.layoutControl1.Location = new System.Drawing.Point(2, 28);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(633, 377, 812, 500);
            this.layoutControl1.Root = this.Root;
            this.layoutControl1.Size = new System.Drawing.Size(757, 250);
            this.layoutControl1.Size = new System.Drawing.Size(549, 252);
            this.layoutControl1.TabIndex = 0;
            this.layoutControl1.Text = "layoutControl1";
            //
            // lb_qtckdcgy
            //
            this.lb_qtckdcgy.Location = new System.Drawing.Point(380, 164);
            this.lb_qtckdcgy.Name = "lb_qtckdcgy";
            this.lb_qtckdcgy.Size = new System.Drawing.Size(70, 18);
            this.lb_qtckdcgy.StyleController = this.layoutControl1;
            this.lb_qtckdcgy.TabIndex = 15;
            this.lb_qtckdcgy.Text = "FStockerId";
            //
            // lb_qtckdllr
            //
            this.lb_qtckdllr.Location = new System.Drawing.Point(380, 126);
            this.lb_qtckdllr.Name = "lb_qtckdllr";
            this.lb_qtckdllr.Size = new System.Drawing.Size(73, 18);
            this.lb_qtckdllr.StyleController = this.layoutControl1;
            this.lb_qtckdllr.TabIndex = 14;
            this.lb_qtckdllr.Text = "FPICKERID";
            //
            // lb_qtkg
            //
            this.lb_qtkg.Location = new System.Drawing.Point(380, 88);
            this.lb_qtkg.Name = "lb_qtkg";
            this.lb_qtkg.Size = new System.Drawing.Size(28, 18);
            this.lb_qtkg.StyleController = this.layoutControl1;
            this.lb_qtkg.TabIndex = 13;
            this.lb_qtkg.Text = "qtkg";
            //
            // lb_qtrkdcgy
            //
            this.lb_qtrkdcgy.Location = new System.Drawing.Point(380, 50);
            this.lb_qtrkdcgy.Name = "lb_qtrkdcgy";
            this.lb_qtrkdcgy.Size = new System.Drawing.Size(70, 18);
            this.lb_qtrkdcgy.StyleController = this.layoutControl1;
            this.lb_qtrkdcgy.TabIndex = 12;
            this.lb_qtrkdcgy.Text = "FStockerId";
            //
            // lb_qtrkdysy
            //
            this.lb_qtrkdysy.Location = new System.Drawing.Point(380, 12);
            this.lb_qtrkdysy.Name = "lb_qtrkdysy";
            this.lb_qtrkdysy.Size = new System.Drawing.Size(97, 18);
            this.lb_qtrkdysy.StyleController = this.layoutControl1;
            this.lb_qtrkdysy.TabIndex = 11;
            this.lb_qtrkdysy.Text = "FACCEPTANCE";
            // 
            // txt_qtrkdysy
            // 
            this.txt_qtrkdysy.Location = new System.Drawing.Point(144, 12);
            this.txt_qtrkdysy.Name = "txt_qtrkdysy";
            this.txt_qtrkdysy.Size = new System.Drawing.Size(232, 24);
            this.txt_qtrkdysy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtrkdysy.StyleController = this.layoutControl1;
            this.txt_qtrkdysy.TabIndex = 4;
            // 
            // txt_qtrkdcgy
            // 
            this.txt_qtrkdcgy.Location = new System.Drawing.Point(144, 50);
            this.txt_qtrkdcgy.Location = new System.Drawing.Point(144, 49);
            this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
            this.txt_qtrkdcgy.Size = new System.Drawing.Size(232, 24);
            this.txt_qtrkdcgy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtrkdcgy.StyleController = this.layoutControl1;
            this.txt_qtrkdcgy.TabIndex = 5;
            // 
            // btnSave
            // 
            this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
            this.btnSave.Location = new System.Drawing.Point(12, 202);
            this.btnSave.Location = new System.Drawing.Point(12, 205);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(96, 27);
            this.btnSave.StyleController = this.layoutControl1;
@@ -166,25 +213,79 @@
            this.txt_qtkg.Location = new System.Drawing.Point(12, 88);
            this.txt_qtkg.Name = "txt_qtkg";
            this.txt_qtkg.Properties.Caption = "齐套开工";
            this.txt_qtkg.Size = new System.Drawing.Size(364, 24);
            this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
            this.txt_qtkg.StyleController = this.layoutControl1;
            this.txt_qtkg.TabIndex = 8;
            // 
            // txt_qtckdllr
            // 
            this.txt_qtckdllr.Location = new System.Drawing.Point(144, 126);
            this.txt_qtckdllr.Location = new System.Drawing.Point(144, 127);
            this.txt_qtckdllr.Name = "txt_qtckdllr";
            this.txt_qtckdllr.Size = new System.Drawing.Size(232, 24);
            this.txt_qtckdllr.Size = new System.Drawing.Size(393, 24);
            this.txt_qtckdllr.StyleController = this.layoutControl1;
            this.txt_qtckdllr.TabIndex = 9;
            // 
            // txt_qtckdcgy
            // 
            this.txt_qtckdcgy.Location = new System.Drawing.Point(144, 164);
            this.txt_qtckdcgy.Location = new System.Drawing.Point(144, 166);
            this.txt_qtckdcgy.Name = "txt_qtckdcgy";
            this.txt_qtckdcgy.Size = new System.Drawing.Size(232, 24);
            this.txt_qtckdcgy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtckdcgy.StyleController = this.layoutControl1;
            this.txt_qtckdcgy.TabIndex = 10;
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.lb_qtrkdysy;
            this.layoutControlItem7.Location = new System.Drawing.Point(368, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem7.TextVisible = false;
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.lb_qtrkdcgy;
            this.layoutControlItem8.Location = new System.Drawing.Point(368, 38);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.lb_qtkg;
            this.layoutControlItem9.Location = new System.Drawing.Point(368, 76);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.lb_qtckdllr;
            this.layoutControlItem10.Location = new System.Drawing.Point(368, 114);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.lb_qtckdcgy;
            this.layoutControlItem11.Location = new System.Drawing.Point(368, 152);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem11.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // Root
            // 
@@ -201,11 +302,8 @@
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2});
            columnDefinition1});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
@@ -225,7 +323,7 @@
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(757, 250);
            this.Root.Size = new System.Drawing.Size(549, 252);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -233,17 +331,17 @@
            this.layoutControlItem1.Control = this.txt_qtrkdysy;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(368, 38);
            this.layoutControlItem1.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem1.Text = "其它入库单验收员";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(120, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_qtrkdcgy;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 38);
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 37);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(368, 38);
            this.layoutControlItem2.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem2.Text = "其它入库单仓管员";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(120, 18);
            // 
@@ -253,7 +351,7 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 76);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(368, 38);
            this.layoutControlItem3.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem3.Text = "齐套开工";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem3.TextVisible = false;
@@ -261,12 +359,12 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.btnSave;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 190);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 193);
            this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
            this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem4.Size = new System.Drawing.Size(368, 40);
            this.layoutControlItem4.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem4.Text = "确定保存";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
@@ -275,121 +373,31 @@
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_qtckdllr;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 114);
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 115);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(368, 38);
            this.layoutControlItem5.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem5.Text = "其它出库单领料人";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(120, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_qtckdcgy;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 152);
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 154);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem6.Size = new System.Drawing.Size(368, 38);
            this.layoutControlItem6.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem6.Text = "其它出库单仓管员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(120, 18);
            // 
            // lb_qtrkdysy
            // groupControl1
            // 
            this.lb_qtrkdysy.Location = new System.Drawing.Point(380, 12);
            this.lb_qtrkdysy.Name = "lb_qtrkdysy";
            this.lb_qtrkdysy.Size = new System.Drawing.Size(97, 18);
            this.lb_qtrkdysy.StyleController = this.layoutControl1;
            this.lb_qtrkdysy.TabIndex = 11;
            this.lb_qtrkdysy.Text = "FACCEPTANCE";
            //
            // lb_qtrkdcgy
            //
            this.lb_qtrkdcgy.Location = new System.Drawing.Point(380, 50);
            this.lb_qtrkdcgy.Name = "lb_qtrkdcgy";
            this.lb_qtrkdcgy.Size = new System.Drawing.Size(70, 18);
            this.lb_qtrkdcgy.StyleController = this.layoutControl1;
            this.lb_qtrkdcgy.TabIndex = 12;
            this.lb_qtrkdcgy.Text = "FStockerId";
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.lb_qtrkdcgy;
            this.layoutControlItem8.Location = new System.Drawing.Point(368, 38);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            //
            // lb_qtkg
            //
            this.lb_qtkg.Location = new System.Drawing.Point(380, 88);
            this.lb_qtkg.Name = "lb_qtkg";
            this.lb_qtkg.Size = new System.Drawing.Size(28, 18);
            this.lb_qtkg.StyleController = this.layoutControl1;
            this.lb_qtkg.TabIndex = 13;
            this.lb_qtkg.Text = "qtkg";
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.lb_qtkg;
            this.layoutControlItem9.Location = new System.Drawing.Point(368, 76);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            //
            // lb_qtckdllr
            //
            this.lb_qtckdllr.Location = new System.Drawing.Point(380, 126);
            this.lb_qtckdllr.Name = "lb_qtckdllr";
            this.lb_qtckdllr.Size = new System.Drawing.Size(73, 18);
            this.lb_qtckdllr.StyleController = this.layoutControl1;
            this.lb_qtckdllr.TabIndex = 14;
            this.lb_qtckdllr.Text = "FPICKERID";
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.lb_qtckdllr;
            this.layoutControlItem10.Location = new System.Drawing.Point(368, 114);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
            //
            // lb_qtckdcgy
            //
            this.lb_qtckdcgy.Location = new System.Drawing.Point(380, 164);
            this.lb_qtckdcgy.Name = "lb_qtckdcgy";
            this.lb_qtckdcgy.Size = new System.Drawing.Size(70, 18);
            this.lb_qtckdcgy.StyleController = this.layoutControl1;
            this.lb_qtckdcgy.TabIndex = 15;
            this.lb_qtckdcgy.Text = "FStockerId";
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.lb_qtckdcgy;
            this.layoutControlItem11.Location = new System.Drawing.Point(368, 152);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem11.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.lb_qtrkdysy;
            this.layoutControlItem7.Location = new System.Drawing.Point(368, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem7.TextVisible = false;
            this.groupControl1.Controls.Add(this.layoutControl1);
            this.groupControl1.Location = new System.Drawing.Point(22, 31);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(553, 282);
            this.groupControl1.TabIndex = 0;
            this.groupControl1.Text = "基础配置";
            // 
            // Frm_Config
            // 
@@ -411,6 +419,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtkg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdllr.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -418,11 +431,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
            this.groupControl1.ResumeLayout(false);
            this.ResumeLayout(false);
        }
@@ -454,5 +464,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.GroupControl groupControl1;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -1,18 +1,9 @@
using DevExpress.Drawing.Internal.Fonts.Interop;
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
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.Sys