From 800f1652b2ed0473850975efe5028685bcd605c4 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f368b8f..0309977 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -21,6 +21,7 @@
string _ucBm = "";//棰嗘枡閮ㄩ棬
string _ucHzlx = "";//璐т富绫诲瀷
string _ucHz = "";//璐т富
+ string _ucGys = "";//渚涘簲鍟�
public Frm_MesItemQt()
{
InitializeComponent();
@@ -64,6 +65,7 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -90,6 +92,7 @@
return;
txt_qt013.getSuppler(_orgId, _ucKh);
txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_wwgys.getSuppler(_orgId, _ucGys);
};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
@@ -160,6 +163,22 @@
else
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
+
+ #region 2025-08-27 澧炲姞濮斿渚涘簲鍟�
+ txt_qtlx.SelectedIndexChanged += (s, e) =>
+ {
+ int idx = txt_qtlx.SelectedIndex;
+ if (idx == 7)
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ }
+ else
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ txt_wwgys.SetIdOrCode("");
}
};
#endregion
@@ -362,6 +381,7 @@
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
+ string wwgys = txt_wwgys.GetId();
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -390,10 +410,33 @@
txt_qtlx.Focus();
return;
}
- if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ //杩欐槸闈炲澶栫殑闃插憜
+ if (txt_qtlx.SelectedIndex != 7)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
- return;
+ if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓嶄负銆�7:鏃犳簮鍗曞澶栭��鏂欍��,璇蜂笉瑕侀�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ }
+ //杩欐槸濮斿鐨勯槻鍛�
+ if (txt_qtlx.SelectedIndex == 7)
+ {
+ if (string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,璇烽�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(inLyCus))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,涓嶇敤閫夋嫨瀹㈡埛锛�");
+ return;
+ }
}
var _obj = new
{
@@ -409,6 +452,7 @@
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
qtlx = qtlx,
+ wwgys = wwgys,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -551,6 +595,11 @@
_ucBm = dy.qt009;
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
+ _ucGys = dy.wwgys;//濮斿渚涘簲鍟�
+ // ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -559,6 +608,7 @@
_ucBm = "";
_ucHzlx = "";
_ucHz = "";
+ _ucGys = "";
ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -853,6 +903,7 @@
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
gvMx1.BestFitColumns();
};
frm.ShowDialog();
--
Gitblit v1.9.3