From 8a7bc73b5ac40d26ec72a5df94ca15c5a2976af0 Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期一, 15 九月 2025 10:20:07 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs index 30a2823..30cce3a 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) => @@ -175,6 +176,27 @@ 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> /// 鍒嗛〉浜嬩欢 /// </summary> @@ -250,7 +272,7 @@ lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -268,18 +290,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); } } @@ -319,7 +343,7 @@ lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -341,7 +365,7 @@ txt_fRequireOrgId.IsReadly = true; txt_fOwnerIdHead.IsReadly = true; txt_fPurchaseDeptId.IsReadly = true; - // txt_fPurchaserId.IsReadly = true; + // txt_fPurchaserId.IsReadly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -516,7 +540,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 @@ -731,6 +759,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)) { @@ -738,13 +769,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(); } @@ -757,7 +790,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