lu
2025-06-06 33e40a739ef06ee82f6c1869ce4f5088b57ed769
其它入库
已修改4个文件
72 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -1,17 +1,12 @@
using DevExpress.XtraEditors;
using DevExpress.XtraTreeList.Nodes;
using DevExpress.XtraTreeList.Nodes;
using DevExpress.XtraTreeList;
using Gs.DevApp.Entity;
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.QC
@@ -199,7 +194,8 @@
                tlMenu.KeyFieldName = "guid";
                tlMenu.ParentFieldName = "pid";
                tlMenu.EndUpdate();
                this.tlMenu.CollapseAll();
                //this.tlMenu.CollapseAll();
                this.tlMenu.ExpandAll();
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCodeShow.cs
@@ -13,9 +13,8 @@
    {
        string strGuid = "";
        string strUpGuid = "";
        string  strType = "";//类别(普通信息,认证信息)
        string strType = "";//信息的分类s_type
        string _webServiceName = "MesDefectCodeManager/";
        /// <summary>
        /// 
@@ -30,7 +29,7 @@
            this.strUpGuid = _strUpGuid;
            this.strType = _strType;
            getSelect();
            //这是更新
            //这是更新,禁止类型和编号
            if (!string.IsNullOrEmpty(this.strGuid))
            {
                getMode(strGuid);
@@ -39,14 +38,13 @@
                txt_defectCode.ReadOnly = true;
                return;
            }
            //这是增加子项
            //这是增加子项,需要初始化它的编号
            if (!string.IsNullOrEmpty(strUpGuid))
            {
                getMode(strUpGuid);
                this.Text = "增加【" + txt_defectName.Text + "】的子项目";
                txt_sType.Enabled = false;
                txt_defectCode.ReadOnly = false;
                txt_defectCode.Text = "";
                txt_defectName.Text = "";
                return;
            }
@@ -139,11 +137,11 @@
        /// 读取实体
        /// </summary>
        /// <param name="strGuid"></param>
        private void getMode(string strGuid)
        private void getMode(string guid)
        {
            var _obj = new
            {
                guid = strGuid,//主建
                guid = guid,//主建
            };
            try
            {
@@ -153,6 +151,8 @@
                {
                    dynamic dy = _rtn.rtnData;
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, true);
                    if(string.IsNullOrEmpty(strGuid))
                    txt_defectCode.Text = dy.maxNo;
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1087,7 +1087,7 @@
            // gvMx1returnFlag
            // 
            this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1returnFlag.Caption = "退货标识";
            this.gvMx1returnFlag.Caption = "退货";
            this.gvMx1returnFlag.FieldName = "returnFlag";
            this.gvMx1returnFlag.MinWidth = 25;
            this.gvMx1returnFlag.Name = "gvMx1returnFlag";
@@ -1096,7 +1096,7 @@
            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
            this.gvMx1returnFlag.Visible = true;
            this.gvMx1returnFlag.VisibleIndex = 0;
            this.gvMx1returnFlag.Width = 50;
            this.gvMx1returnFlag.Width = 26;
            // 
            // gvMx1urgentFlag
            // 
@@ -1105,7 +1105,7 @@
            this.gvMx1urgentFlag.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1urgentFlag.Caption = "急料标识";
            this.gvMx1urgentFlag.Caption = "急料";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 25;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
@@ -1113,7 +1113,7 @@
            this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 1;
            this.gvMx1urgentFlag.Width = 50;
            this.gvMx1urgentFlag.Width = 25;
            // 
            // gvMx1isdepsIn
            // 
@@ -1138,7 +1138,7 @@
            this.gvMx1checkStates.Tag = "query_a.check_states";
            this.gvMx1checkStates.Visible = true;
            this.gvMx1checkStates.VisibleIndex = 2;
            this.gvMx1checkStates.Width = 90;
            this.gvMx1checkStates.Width = 48;
            // 
            // gvMx1checkRes
            // 
@@ -1151,7 +1151,7 @@
            this.gvMx1checkRes.Tag = "query_a.check_res";
            this.gvMx1checkRes.Visible = true;
            this.gvMx1checkRes.VisibleIndex = 3;
            this.gvMx1checkRes.Width = 90;
            this.gvMx1checkRes.Width = 48;
            // 
            // gvMx1ebeln
            // 
@@ -1174,7 +1174,7 @@
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 70;
            this.gridColumn8.Width = 37;
            // 
            // gvMx1boardStyle
            // 
@@ -1187,7 +1187,7 @@
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 6;
            this.gvMx1boardStyle.Width = 180;
            this.gvMx1boardStyle.Width = 96;
            // 
            // gvMx1ebelnQty
            // 
@@ -1200,7 +1200,7 @@
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 7;
            this.gvMx1ebelnQty.Width = 80;
            this.gvMx1ebelnQty.Width = 42;
            // 
            // gvMx1subQty
            // 
@@ -1213,7 +1213,7 @@
            this.gvMx1subQty.Tag = "query_a.sub_qty";
            this.gvMx1subQty.Visible = true;
            this.gvMx1subQty.VisibleIndex = 9;
            this.gvMx1subQty.Width = 80;
            this.gvMx1subQty.Width = 42;
            // 
            // gvMx1quantity
            // 
@@ -1229,7 +1229,7 @@
            this.gvMx1quantity.Tag = "yz_quantity_0_edit";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 10;
            this.gvMx1quantity.Width = 80;
            this.gvMx1quantity.Width = 42;
            // 
            // gvMx1memo
            // 
@@ -1246,7 +1246,7 @@
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 11;
            this.gvMx1memo.Width = 180;
            this.gvMx1memo.Width = 96;
            // 
            // gvMx1okRkqty
            // 
@@ -1259,7 +1259,7 @@
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 8;
            this.gvMx1okRkqty.Width = 80;
            this.gvMx1okRkqty.Width = 42;
            // 
            // gvMx1checkDate
            // 
@@ -1290,7 +1290,7 @@
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 12;
            this.gridColumn9.Width = 50;
            this.gridColumn9.Width = 26;
            // 
            // gridColumn7
            // 
@@ -1301,7 +1301,7 @@
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 13;
            this.gridColumn7.Width = 50;
            this.gridColumn7.Width = 26;
            // 
            // gridColumn6
            // 
@@ -1312,7 +1312,7 @@
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 14;
            this.gridColumn6.Width = 180;
            this.gridColumn6.Width = 96;
            // 
            // gridColumn10
            // 
@@ -1322,7 +1322,7 @@
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 18;
            this.gridColumn10.Width = 94;
            this.gridColumn10.Width = 25;
            // 
            // gridColumn12
            // 
@@ -1332,7 +1332,7 @@
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 19;
            this.gridColumn12.Width = 94;
            this.gridColumn12.Width = 25;
            // 
            // gridColumn13
            // 
@@ -1342,7 +1342,7 @@
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 20;
            this.gridColumn13.Width = 94;
            this.gridColumn13.Width = 25;
            // 
            // gvBtnAlawys
            // 
@@ -1402,7 +1402,7 @@
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 15;
            this.gridColumn15.Width = 94;
            this.gridColumn15.Width = 50;
            // 
            // gridColumn16
            // 
@@ -1412,7 +1412,7 @@
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 16;
            this.gridColumn16.Width = 94;
            this.gridColumn16.Width = 50;
            // 
            // gridColumn2
            // 
@@ -1422,7 +1422,7 @@
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 17;
            this.gridColumn2.Width = 94;
            this.gridColumn2.Width = 26;
            // 
            // gridColumn17
            // 
@@ -1432,7 +1432,7 @@
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 23;
            this.gridColumn17.Width = 94;
            this.gridColumn17.Width = 26;
            // 
            // rptHistory
            // 
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -205,7 +205,7 @@
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_qtck, gridView1, "isSh");
                lbGuid, txt_qtck, gridView1,"qtck");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");