From b270773b9ea1da070a7a4de571cc6eed9d597334 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 六月 2025 15:43:57 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
index 567b2a1..da41d3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs
@@ -6,9 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,7 +15,7 @@
public partial class Frm_RkDetect01 : DevExpress.XtraEditors.XtraForm
{
string _strTag = "N:涓嶅悎鏍�";
-
+
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_RkDetect01()
{
@@ -52,12 +50,7 @@
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
-
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
- {
- ucBtnPrint1.rptParameter = "rpt_SCTL{}";
- };
- this.ucBtnPrint1.btnReportClick += (s, e) =>
+ this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
ucBtnPrint1.guidKey = "";
string rowGuid = txt_aboutGuid.Text.Trim();
@@ -89,7 +82,6 @@
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
};
-
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
@@ -304,7 +296,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -365,9 +357,17 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ string rkckid = txt_rkCkId.GetId();
+ if (string.IsNullOrEmpty(rkckid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
+ txt_rkCkId.Focus();
+ return;
+ }
+
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
txt_fngDesc.Focus();
return;
}
@@ -375,26 +375,29 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngDesc = txt_fngDesc.TextTxt.Trim(),
+ ckId= rkckid
};
try
{
string strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
this.setEable(false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
-
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -462,7 +465,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("","RkqcManager/GetModel", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "RkqcManager/GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -471,6 +474,8 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ string strCk = dy.rkCkId;
+ txt_rkCkId.getSuppler(txt_tlOrg.Text.Trim(), strCk);
setEable(isEdit);
txtQuantity.Text = dy["fbatchQty"].ToString();
txt_kQty.Text = dy["kdy"].ToString();
@@ -506,8 +511,6 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
-
-
JArray array8 = new JArray();
foreach (var a in _job["rtnData"]["barCodeList"])
{
@@ -525,7 +528,7 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
}
}
else
@@ -564,7 +567,7 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/GetModel12", JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/GetModel12", JsonConvert.SerializeObject(_obj));
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
--
Gitblit v1.9.3