Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

cnf

4 天以前 342b5740dded9d8bdb4a6bc5917d79b724b59aec

Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs

@@ -82,7 +82,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.chkAllUrgent = new DevExpress.XtraEditors.CheckEdit();
            this.txt_chkAllUrgent = new DevExpress.XtraEditors.CheckEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
@@ -199,7 +199,7 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.chkAllUrgent.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_chkAllUrgent.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -626,7 +626,7 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.chkAllUrgent);
            this.layoutMx1.Controls.Add(this.txt_chkAllUrgent);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.btnSelect);
            this.layoutMx1.Controls.Add(this.txt_remark);
@@ -656,14 +656,15 @@
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // chkAllUrgent
            // txt_chkAllUrgent
            // 
            this.chkAllUrgent.Location = new System.Drawing.Point(498, 132);
            this.chkAllUrgent.Name = "chkAllUrgent";
            this.chkAllUrgent.Properties.Caption = "急料标识";
            this.chkAllUrgent.Size = new System.Drawing.Size(483, 27);
            this.chkAllUrgent.StyleController = this.layoutMx1;
            this.chkAllUrgent.TabIndex = 469;
            this.txt_chkAllUrgent.Location = new System.Drawing.Point(498, 132);
            this.txt_chkAllUrgent.Name = "txt_chkAllUrgent";
            this.txt_chkAllUrgent.Properties.Caption = "急料标识";
            this.txt_chkAllUrgent.Size = new System.Drawing.Size(483, 27);
            this.txt_chkAllUrgent.StyleController = this.layoutMx1;
            this.txt_chkAllUrgent.TabIndex = 469;
            this.txt_chkAllUrgent.Tag = "";
            // 
            // lbGuid
            // 
@@ -1062,7 +1063,7 @@
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.chkAllUrgent;
            this.layoutControlItem10.Control = this.txt_chkAllUrgent;
            this.layoutControlItem10.Location = new System.Drawing.Point(486, 120);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1835,7 +1836,7 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.chkAllUrgent.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_chkAllUrgent.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -2007,7 +2008,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
        private DevExpress.XtraEditors.CheckEdit chkAllUrgent;
        private DevExpress.XtraEditors.CheckEdit txt_chkAllUrgent;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
    }

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -27,7 +27,7 @@
        public Frm_MesInvItemArn()
        {
            InitializeComponent();
            this.chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
            this.txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -174,9 +174,9 @@
        private void ChkAllUrgent_CheckedChanged(object sender, EventArgs e)
        {
            if (gvMx1.DataRowCount == 0) return;
            if (chkAllUrgent.Properties.ReadOnly) return;
            if (txt_chkAllUrgent.Properties.ReadOnly) return;

            bool isUrgent = chkAllUrgent.Checked;
            bool isUrgent = txt_chkAllUrgent.Checked;
            string targetTxt = isUrgent ? "1:急料" : "0:普通";

            gvMx1.BeginDataUpdate();
@@ -373,11 +373,11 @@
            setSrm();
            txt_receiveOrgId.IsReadly = true;
            txt_suppId.IsReadly = true;
            if (chkAllUrgent != null)
            if (txt_chkAllUrgent != null)
            {
                // 1. 确保控件启用
                chkAllUrgent.Enabled = true;
                chkAllUrgent.Properties.ReadOnly = false;
                txt_chkAllUrgent.Enabled = true;
                txt_chkAllUrgent.Properties.ReadOnly = false;
            }
        }

@@ -584,9 +584,9 @@
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        if (chkAllUrgent != null)
                        if (txt_chkAllUrgent != null)
                        {
                            chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
                            txt_chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
                            bool allUrgent = true;
                            foreach (DataRow dr in dt.Rows)
                            {
@@ -599,12 +599,12 @@
                                }
                            }
                            // 3. 设置开关状态
                            chkAllUrgent.Checked = allUrgent;
                            // 4. 根据当前模式（编辑/查看）决定是否可用
                            // 如果是 add 或 edit 模式，且有权限，则允许点击
                            chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
                            chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
                            chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
                            txt_chkAllUrgent.Checked = allUrgent;
                            //4.根据当前模式（编辑 / 查看）决定是否可用
                            //如果是 add 或 edit 模式，且有权限，则允许点击
                            txt_chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
                            txt_chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
                            txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
                        }
                    }
                    else

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs

@@ -125,10 +125,13 @@
            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_productCode = new DevExpress.XtraEditors.TextEdit();
            this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
            this.txt_djtype = new DevExpress.XtraEditors.ComboBoxEdit();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -186,6 +189,7 @@
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -244,7 +248,6 @@
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.btnSelect1 = new DevExpress.XtraEditors.SimpleButton();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -264,6 +267,7 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).BeginInit();
@@ -316,6 +320,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -452,7 +457,8 @@
            this.gridColumn51,
            this.gridColumn52,
            this.gridColumn53,
            this.gridColumn57});
            this.gridColumn57,
            this.gridColumn58});
            this.gridView1.DetailHeight = 427;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 61;
@@ -778,6 +784,26 @@
            this.gridColumn53.Name = "gridColumn53";
            this.gridColumn53.Width = 117;
            // 
            // gridColumn57
            // 
            this.gridColumn57.Caption = "工单单号";
            this.gridColumn57.FieldName = "workOrderNumber";
            this.gridColumn57.MinWidth = 30;
            this.gridColumn57.Name = "gridColumn57";
            this.gridColumn57.Visible = true;
            this.gridColumn57.VisibleIndex = 22;
            this.gridColumn57.Width = 112;
            // 
            // gridColumn58
            // 
            this.gridColumn58.Caption = "产品编码";
            this.gridColumn58.FieldName = "productCode";
            this.gridColumn58.MinWidth = 30;
            this.gridColumn58.Name = "gridColumn58";
            this.gridColumn58.Visible = true;
            this.gridColumn58.VisibleIndex = 23;
            this.gridColumn58.Width = 112;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -822,6 +848,7 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_productCode);
            this.layoutMx1.Controls.Add(this.btnCopyXls);
            this.layoutMx1.Controls.Add(this.txt_djtype);
            this.layoutMx1.Controls.Add(this.lbGuid);
@@ -865,6 +892,15 @@
            this.layoutMx1.Size = new System.Drawing.Size(1458, 310);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_productCode
            // 
            this.txt_productCode.Location = new System.Drawing.Point(1209, 252);
            this.txt_productCode.Name = "txt_productCode";
            this.txt_productCode.Size = new System.Drawing.Size(237, 28);
            this.txt_productCode.StyleController = this.layoutMx1;
            this.txt_productCode.TabIndex = 446;
            this.txt_productCode.Tag = "readonly";
            // 
            // btnCopyXls
            // 
@@ -1300,7 +1336,8 @@
            this.layoutControlItem11,
            this.layoutControlItem27,
            this.layoutControlItem30,
            this.layoutControlItem1});
            this.layoutControlItem1,
            this.layoutControlItem31});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1595,6 +1632,17 @@
            this.layoutControlItem1.Size = new System.Drawing.Size(359, 48);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
            // 
            // layoutControlItem31
            // 
            this.layoutControlItem31.Control = this.txt_productCode;
            this.layoutControlItem31.Location = new System.Drawing.Point(1077, 240);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem31.Size = new System.Drawing.Size(361, 50);
            this.layoutControlItem31.Text = "产品编码";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
            // 
            // tabMx
            // 
@@ -2260,16 +2308,6 @@
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
            // 
            // gridColumn57
            // 
            this.gridColumn57.Caption = "工单单号";
            this.gridColumn57.FieldName = "workOrderNumber";
            this.gridColumn57.MinWidth = 30;
            this.gridColumn57.Name = "gridColumn57";
            this.gridColumn57.Visible = true;
            this.gridColumn57.VisibleIndex = 22;
            this.gridColumn57.Width = 112;
            // 
            // Frm_MesDbck
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -2300,6 +2338,7 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_productCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_djtype.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).EndInit();
@@ -2352,6 +2391,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2535,5 +2575,8 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
        private DevExpress.XtraEditors.TextEdit txt_productCode;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
    }
}

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -1,4 +1,4 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors;
using DevExpress.XtraPrinting.Native;
using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
@@ -51,7 +51,7 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置申请组织
            //设置申请组织
            this.txt_fapporgid.EditChanged += (s, e) =>
            {
                string _sqGuid = txt_fapporgid.GetId();
@@ -72,7 +72,7 @@
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };

@@ -91,20 +91,20 @@
                gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
            };

            #region 2025-08-27 复制beg
            #region 2025-08-27 复制beg
            btnCopyXls.Click += (s, e) =>
            {
                string kcZz = txt_fapporgid.GetId();
                if (string.IsNullOrEmpty(kcZz))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能使用复制功能！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能使用复制功能！");
                    txt_fapporgid.Focus();
                    return;
                }
                string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
                if (File.Exists(filePath))
                {
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.物料调拨.ToString());
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.物料调拨.ToString());
                    frm.UpdateParent += (ss, ee) =>
                    {
                        try
@@ -153,50 +153,50 @@
                }
                else
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("找不到xlsCopy.xls文件，请联系管理员！");
                }
            };
            #endregion

            #region 2025-10-17 选择生产/委外订单
            #region 2025-10-17 选择生产/委外订单
            btnSelect.Click += (s, e) =>
            {
                string kcZz = txt_fapporgid.GetId();
                if (string.IsNullOrEmpty(kcZz))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择生产订单！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择生产订单！");
                    txt_fapporgid.Focus();
                    return;
                }

                // 根据当前申请类型判断应该打开哪个类型的弹窗
                // 根据当前申请类型判断应该打开哪个类型的弹窗
                string selectedValue = txt_fBillTypeID.EditValue?.ToString();
                string defaultType = "1"; // 默认生产
                if (!string.IsNullOrEmpty(selectedValue) && selectedValue.Contains("委外"))
                string defaultType = "1"; // 默认生产
                if (!string.IsNullOrEmpty(selectedValue) && selectedValue.Contains("委外"))
                {
                    defaultType = "2"; // 委外
                    defaultType = "2"; // 委外
                }
                SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
                SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
                var frm = new SelectSqmx(defaultType); 
                 //var frm = new SelectSqmx();

                // 监听选择类型变化事件，同步更新申请类型
                // 监听选择类型变化事件，同步更新申请类型
                frm.SelectionTypeChanged += (ss, ee) =>
                {
                    string workId = ee.Data; // 1是生产，2是委外
                                             // 生产订单，设置对应的申请类型
                    string workId = ee.Data; // 1是生产，2是委外
                                             // 生产订单，设置对应的申请类型
                    if (workId == "1")
                    {
                        SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
                        SetComboBoxValue(txt_fBillTypeID, "生产调拨申请单(DBSQD03_SC)");
                    }
                    else if (workId == "2")
                    {
                        // 委外订单，设置对应的申请类型
                        SetComboBoxValue(txt_fBillTypeID, "委外调拨申请单(DBSQD02_WW)");
                        // 委外订单，设置对应的申请类型
                        SetComboBoxValue(txt_fBillTypeID, "委外调拨申请单(DBSQD02_WW)");
                    }
                };
                
                //赋值给明细表
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
                    try
@@ -225,14 +225,14 @@
                        };
                        var strReturn = UtilityHelper.HttpPost("", "MesInvItemMovesManager/SelectScddToView", JsonConvert.SerializeObject(_obj));
                        var dt = UtilityHelper.ReturnToList(strReturn);
                        if (dt.rtnCode == -102 && dt.rtnMsg == "委外")
                        if (dt.rtnCode == -102 && dt.rtnMsg == "委外")
                        {
                            MsgHelper.ShowError("提示：业务类型为委外(WW)时，只能选择委外订单！");
                            MsgHelper.ShowError("提示：业务类型为委外(WW)时，只能选择委外订单！");
                            return;
                        }
                        else if (dt.rtnCode == -102 && dt.rtnMsg == "生产")
                        else if (dt.rtnCode == -102 && dt.rtnMsg == "生产")
                        {
                            MsgHelper.ShowError("提示：业务类型为标准(NORMAL)时，只能选择生产订单！");
                            MsgHelper.ShowError("提示：业务类型为标准(NORMAL)时，只能选择生产订单！");
                            return;
                        }
                        ;
@@ -254,25 +254,25 @@
                    }
                    catch(Exception ex)
                    {
                        MsgHelper.ShowError("提示：" + ex.Message);
                        MsgHelper.ShowError("提示：" + ex.Message);
                    }
                };
                frm.ShowDialog();
            };
            #endregion

            #region 2025-10-17 选择委外订单
            #region 2025-10-17 选择委外订单
            btnScdd.Click += (s, e) =>
            {
                string kcZz = txt_fapporgid.GetId();
                if (string.IsNullOrEmpty(kcZz))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择委外订单！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择申请组织后才能选择委外订单！");
                    txt_fapporgid.Focus();
                    return;
                }
                var frm = new SelectScdd("1");
                //赋值给明细表
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
                    try
@@ -300,7 +300,7 @@
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError("提示：" + ex.Message);
                        MsgHelper.ShowError("提示：" + ex.Message);
                    }
                };
                frm.ShowDialog();
@@ -310,7 +310,7 @@
        }

        /// <summary>
        /// 这是打印
        /// 这是打印
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -321,14 +321,14 @@
            if (string.IsNullOrEmpty(rowGuid))
            {
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            Frm_MesDbck_Print_Select frm = new Frm_MesDbck_Print_Select(rowGuid);
            DialogResult result = frm.ShowDialog();
            if (result == DialogResult.Cancel || result == DialogResult.None)
            {
                // 用户点击了取消按钮或直接关闭窗口
                // 用户点击了取消按钮或直接关闭窗口
                this.toolBarMenu1.rptParameter = "return false";
            }

@@ -338,7 +338,7 @@
            //    lbGuid, txt_fBillNo, gridView1, "fBillNo");
            //if (string.IsNullOrEmpty(rowGuid))
            //{
            //    MsgHelper.ShowError("请先选择你要操作的行！");
            //    MsgHelper.ShowError("请先选择你要操作的行！");
            //    return;
            //}
            //this.toolBarMenu1.rptParameter = "rpt_sdzjdb{"
@@ -359,7 +359,7 @@
            getPageList(1);
        }
        /// <summary>
        /// 分页事件
        /// 分页事件
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
@@ -368,7 +368,7 @@
            getPageList(curPage);
        }
        /// <summary>
        /// 查询事件
        /// 查询事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -382,7 +382,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 查询回调
        /// 查询回调
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -393,7 +393,7 @@
        }

        /// <summary>
        /// 取消事件
        /// 取消事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -403,7 +403,7 @@
        }

        /// <summary>
        /// 删除事件
        /// 删除事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -414,10 +414,10 @@
                lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            var _obj = new
            {
@@ -430,7 +430,7 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
@@ -438,16 +438,16 @@
                    getPageList(this.pageBar1.CurrentPage);
                }
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 刷新事件
        /// 刷新事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -469,7 +469,7 @@
            }
        }
        /// <summary>
        /// 修改事件
        /// 修改事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -479,7 +479,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -493,7 +493,7 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(splitMx1.Panel1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
            //2025/07/12加上修改状态下不能修改供应商和组织srm,禁用
            txt_fapporgid.IsReadly = true;
            txt_ftranstype.ReadOnly = true;
            txt_fOwnerTypeIdHead.ReadOnly = true;
@@ -502,7 +502,7 @@
            txt_djtype.Properties.ReadOnly = true;
        }
        /// <summary>
        /// 新增事件
        /// 新增事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -514,14 +514,14 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fapporgid);
            txt_fBusinessType.Properties.ReadOnly = true;
            txt_djtype.Properties.ReadOnly = true;

        }
        /// <summary>
        /// 保存事件
        /// 保存事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -538,54 +538,54 @@
            string gdbh = txt_FSourceOrder.Text.ToString();
            //if (txt_fBillTypeID.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
            //    txt_fBillTypeID.Focus();
            //    return;
            //}
            if (string.IsNullOrEmpty(dbfx))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择调拨方向！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择调拨方向！");
                txt_fTransferDirect.Focus();
                return;
            }
            if (string.IsNullOrEmpty(sqOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择申请组织！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择申请组织！");
                txt_fapporgid.Focus();
                return;
            }
            //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调出货主类型！");
            //    txt_fOwnerTypeIdHead.Focus();
            //    return;
            //}
            //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
            //    Gs.DevApp.ToolBox.MsgHelper.Warning("请选择调入货主类型！");
            //    txt_fOwnerTypeInIdHead.Focus();
            //    return;
            //}
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                djlx = djlx,//单据类型
                ywlx = ywlx,//业务类型
                dbfx = dbfx,//调拨方向
                sqOrg = sqOrg,//审请组织
                dblx = dblx,//调拨类型
                dchzlx = dchzlx,//调出货主类型
                drhzlx = drhzlx,//调入货主类型
                inRemark = txt_fRemarks.Text.Trim(),//备注
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                djlx = djlx,//单据类型
                ywlx = ywlx,//业务类型
                dbfx = dbfx,//调拨方向
                sqOrg = sqOrg,//审请组织
                dblx = dblx,//调拨类型
                dchzlx = dchzlx,//调出货主类型
                drhzlx = drhzlx,//调入货主类型
                inRemark = txt_fRemarks.Text.Trim(),//备注
                list = new List<dynamic>(),
                gdbh = gdbh //工单单号
                gdbh = gdbh //工单单号
            };
            gvMx1.CloseEditor();
            gvMx1.PostEditor();
            gvMx1.UpdateCurrentRow();
            if (gvMx1.DataRowCount <= 0)
            {
                MsgHelper.ShowError("明细不能为空，请选择你的申请明细！");
                MsgHelper.ShowError("明细不能为空，请选择你的申请明细！");
                return;
            }
            for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -597,37 +597,37 @@
                    string _msl = row["shNum"].ToString();
                    if (string.IsNullOrEmpty(_msl))
                    {
                        MsgHelper.ShowError("数量不能为空！");
                        MsgHelper.ShowError("数量不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调出组织不能为空！");
                        MsgHelper.ShowError("调出组织不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调出仓库不能为空！");
                        MsgHelper.ShowError("调出仓库不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调入组织不能为空！");
                        MsgHelper.ShowError("调入组织不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调入仓库不能为空！");
                        MsgHelper.ShowError("调入仓库不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调出货主不能为空！");
                        MsgHelper.ShowError("调出货主不能为空！");
                        return;
                    }
                    if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
                    {
                        MsgHelper.ShowError("调入货主不能为空！");
                        MsgHelper.ShowError("调入货主不能为空！");
                        return;
                    }
                    _obj.list.Add(new
@@ -654,7 +654,7 @@
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_fBillNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -665,15 +665,15 @@
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
        /// 日志
        /// 日志
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -688,8 +688,8 @@
        /// <summary>
        /// 
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;
@@ -717,18 +717,18 @@
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }

        }
@@ -739,12 +739,12 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
            {
                guid = strGuid,//主建
                guid = strGuid,//主建
            };
            try
            {
@@ -778,17 +778,17 @@
                    }
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }


        /// <summary>
        ///     审核事件
        ///     审核事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -798,7 +798,7 @@
        }

        /// <summary>
        ///     反审核
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -808,7 +808,7 @@
            _toolCk(0);
        }
        /// <summary>
        /// 售后审核
        /// 售后审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -819,7 +819,7 @@
        }

        /// <summary>
        /// 售后反审核
        /// 售后反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -829,7 +829,7 @@
            _toolCk(21);
        }
        /// <summary>
        /// 工具条事件
        /// 工具条事件
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(int _inFieldValue)
@@ -838,16 +838,16 @@
            switch (_inFieldValue)
            {
                case 1:
                    strMsg = "审核";
                    strMsg = "审核";
                    break;
                case 0:
                    strMsg = "反审核";
                    strMsg = "反审核";
                    break;
                case 20:
                    strMsg = "售后审核";
                    strMsg = "售后审核";
                    break;
                case 21:
                    strMsg = "售后反审核";
                    strMsg = "售后反审核";
                    break;
            }
            ;
@@ -856,10 +856,10 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
                return;
            var _obj = new
            {
@@ -885,7 +885,7 @@
                    }
                    else
                    {
                        //注意，这里和其它页面有点不一样
                        //注意，这里和其它页面有点不一样
                        getPageList(this.pageBar1.CurrentPage);
                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
@@ -896,13 +896,13 @@
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }


        /// <summary>
        /// 选择物料
        /// 选择物料
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -921,7 +921,7 @@
        }

        /// <summary>
        /// 删除物料
        /// 删除物料
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -934,7 +934,7 @@
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["id"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
@@ -954,22 +954,22 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }


        /// <summary>
        /// 查找调出组织
        /// 查找调出组织
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -989,7 +989,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 查找调出仓库
        /// 查找调出仓库
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1002,7 +1002,7 @@
            var strOrgGuid = dr["dcOrgGuid"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.ShowError("提示：请先选择调出组织！");
                MsgHelper.ShowError("提示：请先选择调出组织！");
                return;
            }
            ;
@@ -1017,7 +1017,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 查找仓位
        /// 查找仓位
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1029,14 +1029,14 @@
            var dr = gvMx1.GetDataRow(rowhandle);
            if (dr["dcCkGuid"] == null)
            {
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                return;
            }
            ;
            var strCkGuid = dr["dcCkGuid"].ToString();
            if (string.IsNullOrEmpty(strCkGuid))
            {
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                MsgHelper.ShowError("提示：请先选择调出仓库！");
                return;
            }
            ;
@@ -1052,7 +1052,7 @@
        }

        /// <summary>
        /// 调入组织
        /// 调入组织
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1072,7 +1072,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 调入仓库
        /// 调入仓库
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1085,7 +1085,7 @@
            var strOrgGuid = dr["drOrgGuid"].ToString();
            if (string.IsNullOrEmpty(strOrgGuid))
            {
                MsgHelper.ShowError("提示：请先选择调入组织！");
                MsgHelper.ShowError("提示：请先选择调入组织！");
                return;
            }
            ;
@@ -1100,7 +1100,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 调入仓位
        /// 调入仓位
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1112,14 +1112,14 @@
            var dr = gvMx1.GetDataRow(rowhandle);
            if (dr["drCkGuid"] == null)
            {
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                return;
            }
            ;
            var strCkGuid = dr["drCkGuid"].ToString();
            if (string.IsNullOrEmpty(strCkGuid))
            {
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                MsgHelper.ShowError("提示：请先选择调入仓库！");
                return;
            }
            ;
@@ -1135,7 +1135,7 @@
        }

        /// <summary>
        /// 调入货主
        /// 调入货主
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1147,7 +1147,7 @@
            int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
            //if (_drhzlx <= 0)
            //{
            //    MsgHelper.Warning("提示：请先选择调入货主类型！");
            //    MsgHelper.Warning("提示：请先选择调入货主类型！");
            //    return;
            //}
            SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1162,7 +1162,7 @@
            frm.ShowDialog();
        }
        /// <summary>
        /// 调出货主
        /// 调出货主
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1175,7 +1175,7 @@
            int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
            //if (_drhzlx <= 0)
            //{
            //    MsgHelper.Warning("提示：请先选择调出货主类型！");
            //    MsgHelper.Warning("提示：请先选择调出货主类型！");
            //    return;
            //}
            SelectHz frm = new SelectHz("", _drhzlx.ToString());
@@ -1190,7 +1190,7 @@
        }

        /// <summary>
        ///  预计开工时间变化事件
        ///  预计开工时间变化事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
@@ -1201,21 +1201,21 @@
            if (string.IsNullOrEmpty(selectedValue))
                return;

            if (selectedValue == "委外调拨申请单(DBSQD02_WW)")
            if (selectedValue == "委外调拨申请单(DBSQD02_WW)")
            {
                SetComboBoxValue(txt_fBusinessType, "委外(WW)");
                SetComboBoxValue(txt_djtype, "委外直接调拨单(WWDB01_SYS)"); 
                SetComboBoxValue(txt_fBusinessType, "委外(WW)");
                SetComboBoxValue(txt_djtype, "委外直接调拨单(WWDB01_SYS)"); 

            }
            else if (selectedValue == "生产调拨申请单(DBSQD03_SC)")
            else if (selectedValue == "生产调拨申请单(DBSQD03_SC)")
            {
                SetComboBoxValue(txt_fBusinessType, "生产(SC)");
                SetComboBoxValue(txt_djtype, "生产直接调拨单(SCDB01_SYS)");
                SetComboBoxValue(txt_fBusinessType, "生产(SC)");
                SetComboBoxValue(txt_djtype, "生产直接调拨单(SCDB01_SYS)");
            }
            else
            {
                SetComboBoxValue(txt_fBusinessType, "标准(NORMAL)");
                SetComboBoxValue(txt_djtype, "标准直接调拨单(ZJDB01_SYS)");
                SetComboBoxValue(txt_fBusinessType, "标准(NORMAL)");
                SetComboBoxValue(txt_djtype, "标准直接调拨单(ZJDB01_SYS)");
            }
        }

@@ -1227,7 +1227,7 @@
            }
            else
            {
                // 如果值不存在，设置为第一个选项或空
                // 如果值不存在，设置为第一个选项或空
                if (comboBox.Properties.Items.Count > 0)
                    comboBox.EditValue = comboBox.Properties.Items[0];
                else