From e5414022999d94626b0d55d29d0dba3ce700fea9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 15:40:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 54d7324..278e648 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -30,6 +30,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
@@ -51,6 +52,8 @@
var orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(orgId))
return;
+ txt_fRequireOrgId.SetIdOrCode(orgId);
+ txt_fOwnerIdHead.SetIdOrCode(orgId);
txt_suppId.getSuppler(orgId, _ucGys);
txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
};
@@ -127,6 +130,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();
@@ -148,10 +153,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();
@@ -175,6 +177,27 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_billNo, gridView1);
toolBarMenu1.guidKey = rowGuid;
+ }
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1, "billNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_CGTH{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
}
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -251,7 +274,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -269,18 +292,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);
}
}
@@ -320,7 +345,7 @@
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -342,7 +367,7 @@
txt_fRequireOrgId.IsReadly = true;
txt_fOwnerIdHead.IsReadly = true;
txt_fPurchaseDeptId.IsReadly = true;
- // txt_fPurchaserId.IsReadly = true;
+ // txt_fPurchaserId.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -517,7 +542,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
@@ -732,6 +761,9 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+
var strOrgGuid = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(strOrgGuid))
{
@@ -739,13 +771,15 @@
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
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();
}
@@ -758,7 +792,7 @@
{
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
--
Gitblit v1.9.3