kyy
2025-08-11 ccf94b9eca1dce73f6af0908327fca3c2cc4484c
1、合并修改红章标识
已修改3个文件
38 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -153,9 +153,9 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
            gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -1478,18 +1478,6 @@
            this.gv_demandDocumentId.VisibleIndex = 14;
            this.gv_demandDocumentId.Width = 23;
            // 
            // picCheckBox
            //
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(808, 43);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 6;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gv_releaseNo
            // 
            this.gv_releaseNo.Caption = "检验单号";
@@ -1498,6 +1486,18 @@
            this.gv_releaseNo.Visible = true;
            this.gv_releaseNo.VisibleIndex = 30;
            // 
            // picCheckBox
            //
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(863, 23);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 6;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // Frm_MesInvItemArn
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -609,22 +609,26 @@
                    _webServiceName + _meth,
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnData.outMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
                    //判断审核后是否变为红章(1:红章已审核 ,-1 黑章未审核)
                    int _inFieldValue = ((_meth == "EditModelSubmit"|| _meth== "EditModelSubmitHb") ? 1 : -1);
                    UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnData.outMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -533,7 +533,7 @@
        private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
        {
            //点击按钮时将未审核样式改为审核样式
            bool bl = _isCk(1);
            if (bl) return;
            if (btnHbClick != null)