From 6f0266b7737f7f6af97cb1ace5bb0521c9b0790c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 27 六月 2025 17:15:21 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 3135a91..42e941b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -36,7 +36,7 @@
txt_gx.Text = _fGx;
txt_bc.Text = _fBc;
txt_dianJianPath.Text = _strinOther;
- dianJianPath= _strinOther;
+ dianJianPath = _strinOther;
this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
addColumn();
txt_barCode.KeyDown += (s, e) =>
@@ -49,7 +49,7 @@
};
btnBad.Click += (s, e) =>
{
- UcDictionarySelect frm = new UcDictionarySelect("涓嶈壇鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰' and pid<>'00000000-0000-0000-0000-000000000000'");
+ 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();
@@ -78,9 +78,9 @@
/// </summary>
/// <param name="_barCode">鏉＄爜</param>
/// <param name="_checkResult">缁撴灉</param>
- /// <param name="_badReson">鍘熷洜</param>
+ /// <param name="_badDescription">涓嶈壇鎻忚堪</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;
@@ -88,11 +88,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 = "";
@@ -109,9 +110,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) //鏌ユ壘鏌愪釜瀛楁涓庡��
{
@@ -121,7 +121,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(" ", ", ");
@@ -138,9 +138,11 @@
_obj.t009 = JNV;
_obj.t010 = XLV;
_obj.t011 = GVV;
+ //姝ｅ紡涓婄嚎瑕佹竻绌烘枃鏈暟鎹�
+ //File.WriteAllText(dianJianPath, "");
return _obj;
}
-
+ //姘存
if (txt_gx.Text.Trim() == fGxShouJian)
{
string strCsl1 = "strCsl1";
@@ -167,15 +169,20 @@
// _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
return _obj;
}
+
+ if (txt_gx.Text.Trim() == fGxZhongJian)
+ {
+ return _obj;
+ }
return null;
}
/// <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))
@@ -184,13 +191,13 @@
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);
+ //if (_obj == null)
+ //{
+ // Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
+ // vm.Show();
+ // return;
+ //}
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
--
Gitblit v1.9.3