From 40036d84a94b47b82b2d6316fb63df5e2847c6df Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期四, 10 七月 2025 11:17:46 +0800 Subject: [PATCH] 首检 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 218 +++++++++++++++++++++++++++++------------------------- 1 files changed, 118 insertions(+), 100 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 43edef3..d635599 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -30,9 +31,13 @@ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; - toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; - toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + this.toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; + this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; + this.toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; + this.toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -49,7 +54,6 @@ }, lbGuid); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛� this.txt_qt022.EditChanged += (s, e) => { @@ -79,44 +83,22 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } }; - gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; - this.ucBtnPrint1.btnDesignClick += (s, e) => + //閫夋嫨srm鏄庣粏 + txt_qt035.ButtonClick += (s, e) => { - ucBtnPrint1.rptParameter = "rpt_Qtrk{}"; - }; - this.ucBtnPrint1.btnReportClick += (s, e) => - { - ucBtnPrint1.guidKey = ""; - string rowGuid = lbMxGuid.Text.Trim(); - ucBtnPrint1.guidKey = rowGuid; - if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim())) + string strSrmNo = ""; + SelectDaa frm = new SelectDaa(); + frm.UpdateParent += (ss, ee) => { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�"); - txt_iCount_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim())) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); - txt_psnQty_1.Focus(); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - if (lbMxGuid.Text.Trim().Length < 10) - { - Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); - this.ucBtnPrint1.rptParameter = "return false"; - return; - } - this.ucBtnPrint1.rptParameter = "rpt_Qtrk{" + lbMxGuid.Text.Trim() - + "," + "" - + "," + "" - + "," + txt_iCount_1.Text.Trim() - + "," + txt_psnQty_1.Text.Trim() - + "}"; + var lst = new List<dynamic>(); + lst = ee.DynamicList; + strSrmNo = lst[0].guid; + txt_qt035.Text = strSrmNo; + }; + frm.ShowDialog(); }; } + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -156,7 +138,7 @@ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; gridView1.ActiveFilter.Clear(); gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); + var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); frm.UpdateParent += Frm_UpdateParent; frm.ShowDialog(); } @@ -189,7 +171,7 @@ { string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_qtck, gridView1, "qtck"); + lbGuid, txt_qtck, gridView1,"qtck"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); @@ -291,6 +273,8 @@ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); ucLookHuoZhu1.Enabled = true; + //澧炲姞鏃讹紝榛樿缁勭粐 + string deftOrg = UtilityHelper.GetFirstOrg(txt_qt022); } /// <summary> /// 淇濆瓨浜嬩欢 @@ -303,7 +287,7 @@ string kcZz = txt_qt022.GetId();//搴撳瓨缁勭粐 string kcBm = txt_qt009.GetId();//搴撳瓨閮ㄩ棬 string kcGys = txt_qt018.GetId();//搴撳瓨渚涘簲鍟� - string djLx = txt_qt003.Text.Trim();//鍗曟嵁绫诲瀷 + string djLx = txt_qt003.TextTxt.Trim();//鍗曟嵁绫诲瀷 string kcfx = txt_qt019.Text.Trim();//搴撳瓨鏂瑰悜 string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷 string inHz = ucLookHuoZhu1.GetHzId();//璐т富 @@ -325,7 +309,7 @@ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�"); return; } - if (txt_qt003.SelectedIndex < 0) + if (txt_qt003.TextTxt.Length < 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); txt_qt003.Focus(); @@ -343,12 +327,12 @@ txt_qt009.Focus(); return; } - if (string.IsNullOrEmpty(kcCk)) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�"); - txt_qt008.Focus(); - return; - } + //if (string.IsNullOrEmpty(kcCk)) + //{ + // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�"); + // txt_qt008.Focus(); + // return; + //} var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 @@ -361,6 +345,7 @@ kcfx = kcfx,//搴撳瓨鏂瑰悜 hzlx = inHzlx,//璐т富绫诲瀷 inHz = inHz,//璐т富 + inSource = txt_qt035.EditValue,//宸ュ崟鍙� list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -388,6 +373,7 @@ ItemId = (row["itemId"].ToString()), Sqsl = (row["qd007"].ToString()), Bz = (row["qd010"].ToString()), + Bllb = (row["qd012"].ToString()), }); } } @@ -423,7 +409,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "qt001", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -458,6 +444,10 @@ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 璇诲彇瀹炰綋 + /// </summary> + /// <param name="strGuid"></param> private void getModel(string strGuid) { gcMx1.DataSource = null; @@ -509,7 +499,7 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); - Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1); } else { @@ -553,7 +543,11 @@ gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]); gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]); } - + /// <summary> + /// 绉诲嚭鏄庣粏 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx1.FocusedRowHandle; @@ -614,7 +608,46 @@ { _toolCk(0); } + /// <summary> + /// 璐㈠姟瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e) + { + _toolCk(30); + } + /// <summary> + /// 璐㈠姟鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e) + { + _toolCk(31); + } + /// <summary> + /// 閲囪喘瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e) + { + _toolCk(40); + } + /// <summary> + /// 閲囪喘鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + + private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e) + { + _toolCk(41); + } /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -629,6 +662,18 @@ break; case 0: strMsg = "鍙嶅鏍�"; + break; + case 30: + strMsg = "璐㈠姟瀹℃牳"; + break; + case 31: + strMsg = "璐㈠姟鍙嶅鏍�"; + break; + case 40: + strMsg = "閲囪喘瀹℃牳"; + break; + case 41: + strMsg = "閲囪喘鍙嶅鏍�"; break; }; toolBarMenu1.guidKey = ""; @@ -660,9 +705,14 @@ { getModel(lbGuid.Text.Trim()); } - int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + //gridView1.FocusedRowHandle = rowHandle; + //UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); + + //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍� + getPageList(this.pageBar1.CurrentPage); + int rowHandle = gridView1.LocateByValue("guid", rowGuid); gridView1.FocusedRowHandle = rowHandle; - UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); } } catch (Exception ex) @@ -670,59 +720,27 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } - private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) + private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { - if (e.FocusedRowHandle >= 0) - { - DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); - lbMxGuid.Text = row["guid"].ToString(); - ucBtnPrint1.guidKey = row["guid"].ToString(); - txtWlid.Text = row["qd002"].ToString(); - txtWlgg.Text = row["qd004"].ToString(); - txtWlmc.Text = row["qd003"].ToString(); - txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺 - txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 - txtKdy.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 - } - } - /// <summary> - /// 绉诲嚭鏉$爜 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - var rowhandle = gvMx2.FocusedRowHandle; + var rowhandle = gvMx1.FocusedRowHandle; if (rowhandle < 0) return; - if (e.Button.Index == 0) + UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'"); + frm.UpdateParent += (ss, ee) => { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - var _obj = new + System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder(); + var lst = ee.DynamicList; + foreach (dynamic dym in lst) { - mxGuid = mxGuid, - inType = "dhtm" - }; - try - { - var strJson = UtilityHelper.HttpPost("", - "VArrivalBarcodeManager/DeleteBarcode", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (stringBuilder.Length > 0) + stringBuilder.Append("|"); + stringBuilder.Append(dym.dicTxt); } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } + gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString()); + // this.TextTxt = ; + }; + frm.ShowDialog(); } + } } \ No newline at end of file -- Gitblit v1.9.3