From c698fcb41fa92d6185f133e65bc16f3467ac9ed3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 21 十一月 2024 15:37:22 +0800
Subject: [PATCH] 修改iqc基础信息维护的细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index a1e2cfd..4fd9b84 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) =>
@@ -54,13 +57,13 @@
txt_itemId.EditChanged += (s, e) =>
{
txt_itemNo.Text = this.txt_itemId.GetCode();
- var ItemId = this.txt_itemId.GetId();
- var ItemName = this.txt_itemId.GetName();
- GetCount(ItemId, ItemName);
+ //var ItemId = this.txt_itemId.GetId();
+ //var ItemName = this.txt_itemId.GetName();
+ //GetCount(ItemId, ItemName);
};
}
- private void GetCount(string ItemId,string ItemName)
+ private int GetCount(string ItemId,string ItemName)
{
//string rowGuid = "", rowName = "";
//(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
@@ -74,16 +77,13 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetCount", JsonConvert.SerializeObject(ItemId));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- MsgHelper.Warning("鎻愮ず锛�"+ ItemName+"杩欎釜鐗╂枡宸茬粡缁存姢浜嗗厤妫�鏁版嵁");
- }
+ return _rtn.rtnCode;
}
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ return -1;
}
}
/// <summary>
@@ -181,8 +181,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
/// 淇敼浜嬩欢
@@ -229,7 +231,7 @@
{
toolBarMenu1.isSetBtn = false;
string _ItemId = txt_itemId.GetId();
- string _suppNo = txt_suppNo.GetCode();
+ string _suppNo = txt_suppNo.GetId();
if (string.IsNullOrEmpty(_ItemId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -247,8 +249,21 @@
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
ItemId = Convert.ToInt32(_ItemId),
ItemNo = txt_itemId.GetCode(),
- SuppNo= _suppNo,
+ 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