From 1544b9ba3902d93a3d701db3656227cc3b46dce8 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 01 八月 2025 14:45:09 +0800
Subject: [PATCH] 过站bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 5 +----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 3 ++-
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 4 ++++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 3d882c0..6ce4c57 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -726,7 +726,6 @@
continue;
}
}
-
//2025-7-20鍔犱笂浜х嚎纭璁板綍
JArray array6 = new JArray();
foreach (var a in _job["rtnData"]["list6"])
@@ -783,6 +782,8 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
}
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
+ txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
+ txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 5b5cde9..05488d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -87,6 +87,9 @@
};
frm.ShowDialog();
};
+
+ this.ActiveControl = this.txt_barCode;
+ txt_barCode.Focus();
}
/// <summary>
@@ -280,6 +283,7 @@
Toast vm = new Toast(-1, ex.Message);
vm.Show();
}
+ txt_barCode.Text = "";
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 292d710..7a2d27c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -10,7 +10,6 @@
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm.Work
{
public partial class Frm_WorkTechnique : DevExpress.XtraEditors.XtraForm
@@ -42,7 +41,6 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
-
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -374,7 +372,6 @@
return;
}
getModel(rowGuid);
-
}
/// <summary>
@@ -465,7 +462,7 @@
MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝璇ユ搷浣滃皢浼氬奖鍝嶅埌銆怐:寰呭紑宸ャ�戜笖銆愭湭閫氱煡澶囨枡銆戠殑宸ュ崟锛岀‘瀹�" + strMsg + "鍚楋紵"))
return;
var _obj = new
{
--
Gitblit v1.9.3