From 2f609b30563132cda27c0f8f4c935757571e03a2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 27 六月 2025 15:56:24 +0800
Subject: [PATCH] 倒冲
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 263 +++++++++++++++++++--------------------------------
1 files changed, 99 insertions(+), 164 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index debfe51..a77deb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,3 +1,5 @@
+using Gs.DevApp.DevFrm.Rk;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -28,6 +30,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
+ toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -59,7 +63,8 @@
if (string.IsNullOrEmpty(daaId)) return;
txt_rwd.Text = txt_tbl002.GetRwd();
txt_workName.Text = txt_tbl002.GetWorkName();
- txt_itemName.Text = txt_tbl002.GetPrdModel();
+ txt_itemName.Text = txt_tbl002.GetPrdName();
+ txt_itemNo.Text = txt_tbl002.GetPrdNo();
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -102,54 +107,9 @@
};
frm.ShowDialog();
};
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
- {
- ucBtnPrint1.rptParameter = "rpt_SCTL{}";
- };
- this.ucBtnPrint1.btnReportClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(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_SCTL{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
- };
-
- //鑷姩璁＄畻鎵撳嵃閲�
- txt_psnQty_1.TextChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
- };
- radOut.SelectedIndexChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
- };
}
+
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -202,56 +162,26 @@
_filterList = e.FilterList;
getPageList(1);
}
- private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- toolBarMenu1.rptParameter = "rpt_SCTL{}";
+ _toolCk(2);
}
- private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ /// <summary>
+ /// 鍙嶆壒鍑�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- {
- getModel(rowGuid);
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
- txt_iCount_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + ""
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
+ _toolCk(3);
}
-
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -392,6 +322,8 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_tbl023);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -450,21 +382,30 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ string _tld014 = row["tld014"].ToString();
+ if (string.IsNullOrEmpty(_tld014))
+ {
+ MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
- Sl = _sl //鐢宠鏁伴噺
- });
+ Sl = _sl, //鐢宠鏁伴噺
+ Remark = _tld014,
+ Bllb = row["tld015"].ToString().Replace("|",",")
+ });
}
}
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -475,10 +416,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -489,7 +432,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -645,46 +588,6 @@
}
}
-
- /// <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;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx2.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var _obj = new
- {
- 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);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
@@ -700,6 +603,12 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "鎵瑰噯";
+ break;
+ case 3:
+ strMsg = "鍙嶆壒鍑�";
+ break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -711,10 +620,31 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檅eg
+ string txt_chkOut = "0";
+ if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "浣滀笟涓嶈壇閫�鏂�") {
+ var frm = new Frm_MesItemTblShow();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ txt_chkOut = ee.StringSingle;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檈nd
+
var _obj = new
{
guid = rowGuid,
inFieldValue = _inFieldValue,
+ chkOut = txt_chkOut
};
try
{
@@ -722,9 +652,10 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -732,39 +663,43 @@
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
Form parentForm = this.FindForm();
- UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString());
+ if (_inFieldValue < 2)
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ /// <summary>
+ /// 閫夋嫨涓嶈壇
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- if (e.FocusedRowHandle >= 0)
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
+ frm.UpdateParent += (ss, ee) =>
{
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- lbMxGuid.Text = row["tlid"].ToString();
- toolBarMenu1.guidKey = row["tlid"].ToString();
- txtWlid.Text = row["tld002"].ToString();
- txtWlgg.Text = row["tld004"].ToString();
- txtWlmc.Text = row["tld003"].ToString();
- txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
- }
- else {
- lbMxGuid.Text ="";
- toolBarMenu1.guidKey = "";
- txtWlid.Text = "";
- txtWlgg.Text = "";
- txtWlmc.Text = "";
- txtQuantity.Text = "";
- txtYdy.Text = "";
- txt_kQty.Text = "";
- }
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
+ // this.TextTxt = ;
+ };
+ frm.ShowDialog();
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3