From a985c4d4b80fbf3eb4abbe385adcd0536fd29eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 22 十一月 2024 15:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 2001b1f..475319a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -1,3 +1,4 @@
+using DevExpress.RichEdit.Export;
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -24,11 +25,13 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "status", "");
+ };
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -50,7 +53,7 @@
private void _setIno()
{
this.txt_itemId.KeyFile = "id";
- this.txt_suppNo.KeyFile = "suppNo";
+ this.txt_suppId.KeyFile = "id";
txt_itemId.EditChanged += (s, e) =>
{
txt_itemNo.Text = this.txt_itemId.GetCode();
@@ -58,30 +61,6 @@
//var ItemName = this.txt_itemId.GetName();
//GetCount(ItemId, ItemName);
};
- }
-
- private int GetCount(string ItemId,string ItemName)
- {
- //string rowGuid = "", rowName = "";
- //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
- //if (string.IsNullOrEmpty(rowGuid))
- //{
- // ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetCount", JsonConvert.SerializeObject(ItemId));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- return _rtn.rtnCode;
-
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return -1;
- }
}
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -228,7 +207,7 @@
{
toolBarMenu1.isSetBtn = false;
string _ItemId = txt_itemId.GetId();
- string _suppNo = txt_suppNo.GetId();
+ string _suppNo = txt_suppId.GetId();
if (string.IsNullOrEmpty(_ItemId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -238,7 +217,7 @@
if (string.IsNullOrEmpty(_suppNo))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
- txt_suppNo.Focus();
+ txt_suppId.Focus();
return;
}
var _obj = new MesQaMj
@@ -248,19 +227,6 @@
ItemNo = txt_itemId.GetCode(),
SuppId = _suppNo,
};
-
- if (lbGuid.Text.Trim().Length == 0)
- {
- var ItemName = txt_itemNo.Text.Trim();
- var flag = GetCount(_ItemId, ItemName);
- if (flag > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- MsgHelper.Warning("鎻愮ず锛�" + ItemName + "杩欎釜鐗╂枡宸茬粡缁存姢浜嗗厤妫�鏁版嵁");
- return;
- }
- }
-
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
--
Gitblit v1.9.3