lu
2024-12-05 de4b3fa6111e0e9e3e5d7edc78054d8efef6b139
检验
已修改7个文件
165 ■■■■■ 文件已修改
DevApp/Gs.DevApp/App.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookCk.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | 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/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,16 +29,16 @@
        /// </summary>
        private void InitializeComponent()
        {
            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();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -167,7 +167,7 @@
            this.gvMx1returnFlag.Tag = "query_a.return_flag";
            this.gvMx1returnFlag.UnboundDataType = typeof(bool);
            this.gvMx1returnFlag.Visible = true;
            this.gvMx1returnFlag.VisibleIndex = 3;
            this.gvMx1returnFlag.VisibleIndex = 1;
            this.gvMx1returnFlag.Width = 100;
            // 
            // gvMx1okRkqty
@@ -181,7 +181,7 @@
            this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 12;
            this.gvMx1okRkqty.VisibleIndex = 10;
            this.gvMx1okRkqty.Width = 100;
            // 
            // gvMx1isdepsIn
@@ -196,7 +196,7 @@
            this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
            this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
            this.gvMx1isdepsIn.Visible = true;
            this.gvMx1isdepsIn.VisibleIndex = 5;
            this.gvMx1isdepsIn.VisibleIndex = 3;
            this.gvMx1isdepsIn.Width = 100;
            // 
            // gvMx1boardStyle
@@ -210,7 +210,7 @@
            this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 7;
            this.gvMx1boardStyle.VisibleIndex = 5;
            this.gvMx1boardStyle.Width = 180;
            // 
            // gvMx1checkDate
@@ -224,7 +224,7 @@
            this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
            this.gvMx1checkDate.Tag = "query_a.check_date";
            this.gvMx1checkDate.Visible = true;
            this.gvMx1checkDate.VisibleIndex = 15;
            this.gvMx1checkDate.VisibleIndex = 13;
            this.gvMx1checkDate.Width = 180;
            // 
            // gvMx1checkStates
@@ -238,7 +238,7 @@
            this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
            this.gvMx1checkStates.Tag = "query_a.check_states";
            this.gvMx1checkStates.Visible = true;
            this.gvMx1checkStates.VisibleIndex = 14;
            this.gvMx1checkStates.VisibleIndex = 12;
            this.gvMx1checkStates.Width = 100;
            // 
            // gvMx1checkRes
@@ -252,7 +252,7 @@
            this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
            this.gvMx1checkRes.Tag = "query_a.check_res";
            this.gvMx1checkRes.Visible = true;
            this.gvMx1checkRes.VisibleIndex = 13;
            this.gvMx1checkRes.VisibleIndex = 11;
            this.gvMx1checkRes.Width = 100;
            // 
            // gvMx1memo
@@ -266,13 +266,17 @@
            this.gvMx1memo.OptionsColumn.ReadOnly = true;
            this.gvMx1memo.Tag = "query_a.memo";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 19;
            this.gvMx1memo.VisibleIndex = 17;
            this.gvMx1memo.Width = 180;
            // 
            // gvMx1urgentFlag
            // 
            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1urgentFlag.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
            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.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 60;
@@ -280,7 +284,7 @@
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 4;
            this.gvMx1urgentFlag.VisibleIndex = 2;
            this.gvMx1urgentFlag.Width = 100;
            // 
            // gvMx1subQty
@@ -294,7 +298,7 @@
            this.gvMx1subQty.OptionsColumn.ReadOnly = true;
            this.gvMx1subQty.Tag = "query_a.sub_qty";
            this.gvMx1subQty.Visible = true;
            this.gvMx1subQty.VisibleIndex = 9;
            this.gvMx1subQty.VisibleIndex = 7;
            this.gvMx1subQty.Width = 100;
            // 
            // gvMx1quantity
@@ -311,7 +315,7 @@
            this.gvMx1quantity.Name = "gvMx1quantity";
            this.gvMx1quantity.Tag = "yz_quantity_0";
            this.gvMx1quantity.Visible = true;
            this.gvMx1quantity.VisibleIndex = 10;
            this.gvMx1quantity.VisibleIndex = 8;
            this.gvMx1quantity.Width = 100;
            // 
            // gvMx1ebelnQty
@@ -325,7 +329,7 @@
            this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
            this.gvMx1ebelnQty.Visible = true;
            this.gvMx1ebelnQty.VisibleIndex = 11;
            this.gvMx1ebelnQty.VisibleIndex = 9;
            this.gvMx1ebelnQty.Width = 100;
            // 
            // gvMx1ebelnLine
@@ -352,7 +356,7 @@
            this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 2;
            this.gvMx1ebeln.VisibleIndex = 0;
            this.gvMx1ebeln.Width = 120;
            // 
            // gvMx1guid
@@ -395,8 +399,6 @@
            this.gvMx1guid,
            this.gvMx1ebelnLine,
            this.gridColumn1,
            this.gvMxDel,
            this.gvMxTui,
            this.gvMx1ebeln,
            this.gvMx1returnFlag,
            this.gvMx1urgentFlag,
@@ -414,7 +416,9 @@
            this.gridColumn3,
            this.gridColumn9,
            this.gridColumn7,
            this.gvMx1memo});
            this.gvMx1memo,
            this.gvMxTui,
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -447,37 +451,37 @@
            this.gvMxDel.MinWidth = 80;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 0;
            this.gvMxDel.VisibleIndex = 19;
            this.gvMxDel.Width = 80;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions6.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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", 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);
            // 
            // gvMxTui
            // 
            this.gvMxTui.Caption = "退货";
            this.gvMxTui.Caption = "操作";
            this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
            this.gvMxTui.MinWidth = 80;
            this.gvMxTui.Name = "gvMxTui";
            this.gvMxTui.Visible = true;
            this.gvMxTui.VisibleIndex = 1;
            this.gvMxTui.VisibleIndex = 18;
            this.gvMxTui.Width = 94;
            // 
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "退货", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "退货", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -489,7 +493,7 @@
            this.gridColumn8.MinWidth = 70;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 6;
            this.gridColumn8.VisibleIndex = 4;
            this.gridColumn8.Width = 70;
            // 
            // gridColumn6
@@ -500,7 +504,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 8;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.Width = 180;
            // 
            // gridColumn3
@@ -511,7 +515,7 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 16;
            this.gridColumn3.VisibleIndex = 14;
            this.gridColumn3.Width = 180;
            // 
            // gridColumn9
@@ -522,7 +526,7 @@
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 17;
            this.gridColumn9.VisibleIndex = 15;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn7
@@ -533,7 +537,7 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 18;
            this.gridColumn7.VisibleIndex = 16;
            this.gridColumn7.Width = 94;
            // 
            // lb_fType
@@ -1098,7 +1102,7 @@
            // 
            // txt_receiveOrgId
            // 
            this.txt_receiveOrgId.IsReadly = true;
            this.txt_receiveOrgId.IsReadly = false;
            this.txt_receiveOrgId.Location = new System.Drawing.Point(88, 16);
            this.txt_receiveOrgId.Name = "txt_receiveOrgId";
            this.txt_receiveOrgId.Size = new System.Drawing.Size(215, 28);
@@ -1163,7 +1167,7 @@
            // 
            // txt_depotsId
            // 
            this.txt_depotsId.IsReadly = true;
            this.txt_depotsId.IsReadly = false;
            this.txt_depotsId.Location = new System.Drawing.Point(88, 87);
            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotsId.Name = "txt_depotsId";
@@ -1191,7 +1195,7 @@
            // 
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(88, 51);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -43,6 +43,15 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
            };
            //设置组织
            this.txt_receiveOrgId.EditChanged += (s, e) =>
            {
                string _orgId = txt_receiveOrgId.GetId();
                if (string.IsNullOrEmpty(_orgId))
                    return;
                txt_suppId.getSuppler(_orgId);
                txt_depotsId.getSuppler(_orgId);
            };
            //设置仓库选择
            this.txt_depotsId.EditChanged += (s, e) =>
            {
@@ -94,7 +103,7 @@
                };
                frm.ShowDialog();
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -371,8 +380,8 @@
        {
            toolBarMenu1.isSetBtn = false;
            string _orgId = txt_receiveOrgId.GetId();
            var _ckId = txt_depotsId.GetId(); //仓库编号 depots_code
            var _gysId = txt_suppId.GetId(); //供应商编号
            string _ckId = txt_depotsId.GetId(); //仓库编号 depots_code
            string _gysId = txt_suppId.GetId(); //供应商编号
            if (string.IsNullOrEmpty(_orgId))
            {
                MsgHelper.Warning("请选择收料组织!");
@@ -391,16 +400,16 @@
                txt_depotsId.Focus();
                return;
            }
            var _obj = new MesInvItemArn()
            var _obj = new
            {
                Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键
                PaperBillNo = txt_paperBillNo.Text.Trim(), //送货单号;
                Remark = txt_remark.Text.Trim(), //备注
                SuppId = _gysId, //供应商
                DepotsId = _ckId,//仓库
                FType = txt_fType.Checked,//0=采购,1=委外
                UrgentFlag = false,
                list = new List<MesInvItemArnDetail>(),
                FType = txt_fType.Checked ? 1 : 0,//0=采购,1=委外
                OrgId = _orgId,
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
@@ -421,16 +430,16 @@
                        MsgHelper.ShowError("数量不能为空!");
                        return;
                    }
                    _obj.list.Add(new MesInvItemArnDetail
                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        ItemId = int.Parse(row["itemId"].ToString()),
                        Quantity = decimal.Parse(row["quantity"].ToString())
                        Quantity = decimal.Parse(row["quantity"].ToString()),
                        UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
                    });
                }
            }
            try
            {
                var strJson = UtilityHelper.HttpPost("",
@@ -496,7 +505,7 @@
            _loading.Stop();
        }
        private async void getModel(string strGuid, bool isEdit, int tabIdx)
        private void getModel(string strGuid, bool isEdit, int tabIdx)
        {
            if (string.IsNullOrEmpty(strGuid))
            {
@@ -504,14 +513,13 @@
                return;
            }
            UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
            UcLoading _loading = new UcLoading();
            var _obj = new
            {
                guid = strGuid //主建
            };
            try
            {
                var strJson = await UtilityHelper.HttpPostAsync("",
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "GetModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -521,8 +529,7 @@
                    lbGuid.Text = strGuid;
                    var gvList = new List<GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
                        gvList);
                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
                    var _job = JObject.Parse(strJson);
                    var array = new JArray();
                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -549,7 +556,6 @@
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
            _loading.Stop();
        }
        /// <summary>
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1073,6 +1073,14 @@
                return 0;
            }
        }
        public static int ToBit(string str)
        {
            if (str.ToUpper() == "true".ToUpper())
                return 1;
            return 0;
        }
        /// <summary>
        /// 读取grid的当前行
        /// </summary>
DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -15,7 +15,7 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
        }
        public bool IsReadly { get; set; }
        
@@ -30,10 +30,10 @@
            if (EditChanged != null) EditChanged(this, e);
        }
        private void getSuppler()
        public void getSuppler(string orgId)
        {
            var pgq = new PageQueryModel(1, 999999, "depot_code", "asc", "",
                " and is_ng='A'");
                " and is_ng='A'"+"  and a.FSubsidiary ='" + orgId + "'");
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -43,7 +43,7 @@
                var dt = rtn.rtnData.list;
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "depotName";
                 lookSearchSupplier.Properties.ValueMember = "depotId";
                lookSearchSupplier.Properties.ValueMember = "depotId";
            }
            catch (Exception ex)
            {
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -87,7 +87,8 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            lookSearchSupplier.EditValue =(((Code.ToString().Trim())));
        }
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -1,6 +1,7 @@
using System;
using System.Data;
using System.Windows.Media.Animation;
using DevExpress.Emf;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -17,10 +18,9 @@
            lookSearchSupplier.Properties.NullText = "请选择";
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
        }
        public bool IsReadly { get; set; }
        /// <summary>
        ///     改变事件
        /// </summary>
@@ -32,14 +32,14 @@
            if (EditChanged != null) EditChanged(this, e);
        }
        private void getSuppler()
        public void getSuppler(string orgId)
        {
            var _obj = new
            {
                currentPage = 1,
                everyPageSize = 999999,
                sortName = "",
                keyWhere = "",
                keyWhere = " and a.FSubsidiary ='" + orgId + "'",
            };
            var json = JsonConvert.SerializeObject(_obj);
            try
@@ -50,8 +50,8 @@
                var dt = rtn.rtnData.list;
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "suppName";
               lookSearchSupplier.Properties.ValueMember = "id";
                lookSearchSupplier.Properties.ValueMember = "id";
            }
            catch (Exception ex)
            {
@@ -92,7 +92,9 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            //   lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
            lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
        }
    }
}