From 33583f8a9716e4313163fb9bbde58fea02012a28 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 08 九月 2025 14:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index cf9d129..80bd659 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -124,27 +124,27 @@
ToolBox.MsgHelper.ShowError("璇锋鏌ョО閲嶈缃紒");
return;
}
- if (txtW1.Text.Trim().Length <= 0)
+ if (txt_weight1.Text.Trim().Length <= 0)
{
_setWeigth(1, _strCurrent);
return;
}
- if (txtW2.Text.Trim().Length <= 0)
+ if (txt_weight2.Text.Trim().Length <= 0)
{
_setWeigth(2, _strCurrent);
return;
}
- if (txtW3.Text.Trim().Length <= 0)
+ if (txt_weight3.Text.Trim().Length <= 0)
{
_setWeigth(3, _strCurrent);
return;
}
- if (txtW4.Text.Trim().Length <= 0)
+ if (txt_weight4.Text.Trim().Length <= 0)
{
_setWeigth(4, _strCurrent);
return;
}
- if (txtW5.Text.Trim().Length <= 0)
+ if (txt_weight5.Text.Trim().Length <= 0)
{
_setWeigth(5, _strCurrent);
return;
@@ -188,32 +188,32 @@
{
if (_weightType == 1)
{
- txtW1.Text = _weight;
+ txt_weight1.Text = _weight;
return;
}
if (_weightType == 2)
{
- txtW2.Text = _weight;
+ txt_weight2.Text = _weight;
return;
}
if (_weightType == 3)
{
- txtW3.Text = _weight;
+ txt_weight3.Text = _weight;
return;
}
if (_weightType == 4)
{
- txtW4.Text = _weight;
+ txt_weight4.Text = _weight;
return;
}
if (_weightType == 5)
{
- txtW5.Text = _weight;
+ txt_weight5.Text = _weight;
return;
}
if (_weightType == 99)
{
- this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+ this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
return;
}
}
@@ -554,12 +554,12 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
fngDesc = txt_fngDesc.TextTxt.Trim(),
+ iqcRemark= txt_iqcRemark.Text.Trim(),
};
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
if (_rtn.rtnCode > 0)
{
ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -588,7 +588,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" a.ReceiveOrgId in");
+ _sbSqlWhere.Append(" and a.ReceiveOrgId in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
--
Gitblit v1.9.3