bug

lu

2025-08-02 0e9ba4ee9ee5c37a9379de1d352fd4973d3691f7

bug

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs

@@ -84,6 +84,7 @@
            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,7 +100,6 @@
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -166,6 +166,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -181,7 +182,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -497,7 +497,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 16;
            this.gridColumn11.VisibleIndex = 17;
            this.gridColumn11.Width = 94;
            // 
            // gridColumn9
@@ -507,7 +507,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 17;
            this.gridColumn9.VisibleIndex = 16;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn10
@@ -741,6 +741,17 @@
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_depotId;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem15.Text = "仓库ID";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -938,17 +949,6 @@
            this.sp_fSubsidiary.Size = new System.Drawing.Size(276, 30);
            this.sp_fSubsidiary.Text = "生产组织";
            this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_depotId;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem15.Text = "仓库ID";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1342,6 +1342,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1357,7 +1358,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);

 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs

@@ -47,7 +47,12 @@
            //类型，iqc,ipqc巡检，ipqc首检查,fqc，iqc的样品值默认为5，其它为1
            txt_ftype.Text = strType;
            if (strType == QcSeason.iqc.ToString())
                dfValue = 5;
            {
                dfValue = 5; 
                gvMx1.Columns["funit"].Visible = true;
                gvMx1.Columns["funit"].VisibleIndex = 13;
                gvMx1.Columns["fcheckType"].Visible = false;
            }
            if (strType == QcSeason.fqc.ToString())
            {
                dfValue = 0;
@@ -57,13 +62,13 @@
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
                gvMx1.Columns["funit"].Visible = true;
                gvMx1.Columns["funit"].VisibleIndex = 13;
               
            }
            //如果是ipqc巡检，显示工位
            if (strType != QcSeason.ipqc巡检.ToString())
            {
                gvMx1.Columns["stationName"].Visible = false;
                gvMx1.Columns["fcheckType"].Visible = false;
            }
            //新行初始值
            this.gvMx1.InitNewRow += (s, e) =>

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs

@@ -256,8 +256,10 @@
                    lbSum3.Text = dy.lbSum3;
                    lbSum4.Text = dy.lbSum4;
                    prog1.Position = dy.jd;
                    //良品列表
                    txt_barCode.ReadOnly = false;
                    if (txt_gx.Text.Trim() == fGxShouJian)
                        txt_gongWei.ReadOnly = false;
                    //良品列表
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])