From 014916bf6294dff044014cb7de4f0a334478cf72 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 25 八月 2025 11:00:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index c27778e..17fb6e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -53,7 +53,6 @@
return;
txt_suppId.getSuppler(orgId, _ucGys);
txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
- // txt_fPurchaserId.getSuppler();
};
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -128,6 +127,8 @@
_row["remark"] = dym.remark;
_row["orderNo"] = dym.orderNo; //搴忓彿
_row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
+ _row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
+ _row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -149,10 +150,7 @@
};
//婧愬崟浜嬩欢
txt_fHasLinkRad.SelectedIndex = 0;
- layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ setSrm();
txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
{
setSrm();
@@ -252,7 +250,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -270,18 +268,20 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
+ else
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -321,7 +321,7 @@
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -343,7 +343,7 @@
txt_fRequireOrgId.IsReadly = true;
txt_fOwnerIdHead.IsReadly = true;
txt_fPurchaseDeptId.IsReadly = true;
- txt_fPurchaserId.IsReadly = true;
+ // txt_fPurchaserId.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -377,7 +377,8 @@
string _xqzz = txt_fRequireOrgId.GetId();//闇�姹傜粍缁�
string _hz = txt_fOwnerIdHead.GetId();//璐т富
string _bm = txt_fPurchaseDeptId.GetId();//閮ㄩ棬
- string _ygbh = txt_fPurchaserId.GetId();//鍛樺伐
+ //string _ygbh = txt_fPurchaserId.GetId();//鍛樺伐
+ string _ygbh = "";
if (string.IsNullOrEmpty(_orgId))
{
MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�");
@@ -423,12 +424,12 @@
txt_fPurchaseDeptId.Focus();
return;
}
- if (string.IsNullOrEmpty(_ygbh))
- {
- MsgHelper.ShowError("璇烽�夋嫨鍛樺伐锛�");
- txt_fPurchaserId.Focus();
- return;
- }
+ //if (string.IsNullOrEmpty(_ygbh))
+ //{
+ // MsgHelper.ShowError("璇烽�夋嫨鍛樺伐锛�");
+ // txt_fPurchaserId.Focus();
+ // return;
+ //}
}
var _obj = new
{
@@ -517,7 +518,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.TH_ORG_ID in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -758,14 +763,14 @@
{
layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ // layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
else
{
layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
- layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ //layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
}
}
--
Gitblit v1.9.3