Merge remote-tracking branch 'origin/master'

啊鑫

10 天以前 8366fcbfed5c66fa1fab4f6dba964a3451c24091

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -1,18 +1,16 @@
using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace Gs.DevApp.DevFrm
namespace Gs.DevApp.DevFrm.Rk
{
    public partial class Frm_MesItemTbl : DevExpress.XtraEditors.XtraForm
    {
@@ -115,14 +113,6 @@
            //打印事件
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {

                if ((txt_tbl013.EditValue.ToString() == "False") )
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("该退料申请单未审核不能打印条码");
                    txt_tbl013.Focus();
                    return;
                }

                string rowGuid = lbMxGuid.Text.Trim();
                ucBtnPrint1.guidKey = rowGuid;
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
@@ -405,8 +395,7 @@
            //2025/07/12加上修改状态下不能修改
            txt_tbl023.IsReadly = true;
            txt_tbl002.IsReadly = true;
            //txt_tbl005.ReadOnly = true;
            //txt_tbl005.EditValue = true;
            txt_tbl005.ReadOnly = true;
        }
        /// <summary>
        /// 新增事件
@@ -448,9 +437,9 @@
                txt_tbl002.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
            if (txt_tbl005.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择原因！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择类型！");
                txt_tbl005.Focus();
                return;
            }
@@ -460,14 +449,6 @@
                txt_tbl005.Focus();
                return;
            }

            if ((txt_tbl005.Text.Trim() == "来料不良退料") && txt_chkOut.Checked)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("来料不良退料不能自动生成补料单，请检查！");
                txt_tbl005.Focus();
                return;
            }

            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -548,7 +529,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.tbl023 in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try