Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

2025-09-03 cc286e3641ef72fe7cb1312487a6d4e40bda81fe

 DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs

@@ -1,10 +1,8 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
using System.Windows;

namespace Gs.DevApp.UserControl
{
@@ -17,10 +15,9 @@
            searchLookUpEdit1View.OptionsView.ColumnAutoWidth = true;
            lookSearchSupplier.EditValueChanged +=
                LookSearchSupplier_EditValueChanged;
            getSuppler();
        }

        public bool IsReadly { get; set; }
        private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }

        /// <summary>
        ///     改变事件
@@ -33,9 +30,16 @@
            if (EditChanged != null) EditChanged(this, e);
        }

        private void getSuppler()
        public void getSuppler(string orgId, string _dftVale = "")
        {
            var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1");
            lookSearchSupplier.EditValue = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            if (!string.IsNullOrEmpty(orgId))
                _sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
            _sbSqlWhere.Append("  and a.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());

            var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -47,6 +51,10 @@
                lookSearchSupplier.Properties.ValueMember = "departmentid";
                lookSearchSupplier.ForceInitialize();
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(_dftVale))
                    SetIdOrCode(_dftVale);
                else
                    lookSearchSupplier.EditValue = null;
            }
            catch (Exception ex)
            {
@@ -87,8 +95,8 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            if(!string.IsNullOrEmpty(Code))
            lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
        }