From 78ded57d2cf4fd2cc6ae731a625a4d6528bede49 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 01 八月 2025 11:20:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 121 +++++++++++++++++++--------------------
1 files changed, 59 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 1252990..5b5cde9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraGrid.Columns;
+using DevExpress.XtraLayout.Utils;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -10,7 +11,6 @@
using System.IO;
using System.Text;
using System.Windows.Forms;
-using static DevExpress.XtraPrinting.Native.ExportOptionsPropertiesNames;
namespace Gs.DevApp.DevFrm.Work
{
@@ -30,20 +30,27 @@
/// </summary>
/// <param name="_fGx">宸ュ簭</param>
/// <param name="_fBc">鐝</param>
- public Frm_Work01(string _fGx, string _fBc)
+ /// <param name="_strinOther">鐩墠涓虹數妫�璺緞</param>
+ public Frm_Work01(string _fGx, string _fBc, string _strinOther)
{
InitializeComponent();
+ gvMx1.IndicatorWidth = 60;
+ gvMx1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
txt_gx.Text = _fGx;
txt_bc.Text = _fBc;
- this.Text = "宸ュ簭閲囬泦 - " + _fGx + " - " + _fBc;
- if (!getConfig())
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇诲彇閰嶇疆鏂囦欢澶辫触锛岃鑱旂郴绠＄悊鍛橈紒");
- }
+ txt_dianJianPath.Text = _strinOther;
+ dianJianPath = _strinOther;
+ this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
+ label8.Text = _fGx + "鏁伴噺";
addColumn();
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { addModel(goodTag); };
+ if (e.KeyCode == Keys.Enter) { addModel(goodTag); }
+ ;
};
btnGood.Click += (s, e) =>
{
@@ -51,7 +58,14 @@
};
btnBad.Click += (s, e) =>
{
- UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰'");
+ string _barCode = txt_barCode.Text.Trim();
+ if (string.IsNullOrEmpty(_barCode))
+ {
+ Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+ vm.Show();
+ return;
+ }
+ UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -76,41 +90,13 @@
}
/// <summary>
- /// 鍏堣鍙栭厤缃�
+ /// 鏍规嵁宸ュ簭锛屾瀯閫犱笉鍚岀被鍨嬬殑瀹炰綋
/// </summary>
+ /// <param name="_barCode">鏉＄爜</param>
+ /// <param name="_checkResult">缁撴灉</param>
+ /// <param name="_badDescription">涓嶈壇鎻忚堪</param>
/// <returns></returns>
- private bool getConfig()
- {
- string _where = " and 1=1 and defect_code='7001'";
- var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- if (dt != null && dt.Rows.Count > 0)
- {
- dianJianPath = dt.Rows[0]["defectName"].ToString();
- return true;
- }
- return false;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return false;
- }
- }
-
- /// <summary>
- /// 璇诲彇瀹炰綋
- /// </summary>
- /// <param name="_barCode"></param>
- /// <param name="_checkResult"></param>
- /// <param name="_badReson"></param>
- /// <returns></returns>
- private dynamic getObj(string _barCode, string _checkResult, string _badReson = "")
+ private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "")
{
dynamic _obj = new ExpandoObject();
_obj.barCode = _barCode;
@@ -118,11 +104,12 @@
_obj.processNo = txt_gx.Text.Trim();//宸ュ簭
_obj.banCi = txt_bc.Text.Trim();//鐝
_obj.gongWei = txt_gw.Text.Trim();//宸ヤ綅
- _obj.badReson = _badReson.Trim();//涓嶈壇鍘熷洜
+ _obj.badDescription = _badDescription.Trim();//涓嶈壇鎻忚堪
if (txt_gx.Text.Trim() == fGxTouRu)
{
return _obj;
}
+ //鐢垫
if (txt_gx.Text.Trim() == fGxDianJian)
{
string TM = "";
@@ -139,9 +126,8 @@
string myStr = File.ReadAllText(dianJianPath, Encoding.Default);
if (myStr == "")
{
- return null;
+ return _obj;
}
- File.WriteAllText(dianJianPath, "");
JArray dsTemp = JArray.Parse(myStr);
foreach (var ss in dsTemp) //鏌ユ壘鏌愪釜瀛楁涓庡��
{
@@ -151,7 +137,7 @@
JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
- JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ", ");
+ JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ",");
JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
XLV = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["value"].ToString().Replace(" ", ", ");
@@ -168,9 +154,11 @@
_obj.t009 = JNV;
_obj.t010 = XLV;
_obj.t011 = GVV;
+ //姝ｅ紡涓婄嚎瑕佹竻绌烘枃鏈暟鎹�
+ //File.WriteAllText(dianJianPath, "");
return _obj;
}
-
+ //姘存
if (txt_gx.Text.Trim() == fGxShouJian)
{
string strCsl1 = "strCsl1";
@@ -183,6 +171,7 @@
string strSw4 = "strSw4";
string strCsl5 = "strCsl5";
string strSw5 = "strSw5";
+ string SJJG = "";
_obj.t002 = strCsl1;
_obj.t003 = strSw1;
_obj.t004 = strCsl2;
@@ -193,6 +182,11 @@
_obj.t009 = strSw4;
_obj.t010 = strCsl5;
_obj.t011 = strSw5;
+ // _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
+ return _obj;
+ }
+ if (txt_gx.Text.Trim() == fGxZhongJian)
+ {
return _obj;
}
return null;
@@ -201,9 +195,9 @@
/// <summary>
/// 涓婃姤瀹炰綋
/// </summary>
- /// <param name="_checkResult">鍒ゅ畾缁撴灉</param>
- /// <param name="_badReson">涓嶈壇鍘熷洜锛屽彲绌�</param>
- private void addModel(string _checkResult, string _badReson = "")
+ /// <param name="_checkResult">缁撴灉锛氣垰</param>
+ /// <param name="_badDescription">涓嶈壇鎻忚堪</param>
+ private void addModel(string _checkResult, string _badDescription = "")
{
string _barCode = txt_barCode.Text.Trim();
if (string.IsNullOrEmpty(_barCode))
@@ -212,13 +206,7 @@
vm.Show();
return;
}
- dynamic _obj = getObj(_barCode, _checkResult, _badReson);
- if (_obj == null)
- {
- Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
- vm.Show();
- return;
- }
+ dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -278,7 +266,8 @@
{
Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
vm.Show();
- };
+ }
+ ;
}
else
{
@@ -294,10 +283,21 @@
}
/// <summary>
- /// 澧炲姞鐢垫鍙栨暟鐨勫垪
+ /// 澧炲姞鐢垫锛屾按妫�鐨勫垪
/// </summary>
public void addColumn()
{
+ //鍙湁鐢垫鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxDianJian)
+ layDianJian.Visibility = LayoutVisibility.Always;
+ else
+ layDianJian.Visibility = LayoutVisibility.Never;
+ //鍙湁姘存鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxShouJian)
+ layShuiJian.Visibility = LayoutVisibility.Always;
+ else
+ layShuiJian.Visibility = LayoutVisibility.Never;
+
List<dynamic> _lst = new List<dynamic>();
if (txt_gx.Text.Trim() == fGxDianJian)
{
@@ -350,7 +350,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t011",
@@ -417,7 +416,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t010",
@@ -443,6 +441,5 @@
gvMx1.Columns.Add(newColumn);
}
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3