From 3d01064f3ba6352d054b356669d023eb6cc7e52e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 四月 2025 16:56:31 +0800
Subject: [PATCH] 多级审核
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 127 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 46 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 538b62a..3148c76 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraPivotGrid.Data;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -30,6 +31,7 @@
this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -70,49 +72,24 @@
//杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
this.ucBtnPrint100.btnDesignClick += (s, e) =>
{
- ucBtnPrint100.rptParameter = "rpt_trace{}";
+ ucBtnPrint100.rptParameter = "rpt_hgm{}";
};
this.ucBtnPrint100.btnReportClick += (s, e) =>
{
_print100();
};
- txt_psnQty_1.TextChanged += Txt_psnQty_1_TextChanged;
- }
-
- private void Txt_psnQty_1_TextChanged(object sender, EventArgs e)
- {
- string sum = txt_kQty.Text.Trim();
- string t1 = txt_psnQty_1.Text.Trim();
- string t2 = txt_iCount_1.Text.Trim();
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(sum))
- sum = txt_kQty.Text = "0";
-
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
- t1 = txt_psnQty_1.Text = "0";
-
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t2))
- t2 = txt_iCount_1.Text = "0";
-
- if (t1 == "0")
+ txt_psnQty_1.TextChanged += (s, e) =>
{
- t2 = txt_iCount_1.Text = "0";
- return;
- }
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ };
- decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum);
- decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1);
-
- int dividend = int.Parse(sum); // 琚櫎鏁�
- int divisor = int.Parse(t1); // 闄ゆ暟
-
- int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
- int remainder = dividend % divisor; // 浣欐暟
-
- txt_iCount_1.Text = quotient.ToString();
- radOut.Properties.Items[0].Description = "鍙﹀嵃" + remainder.ToString();
-
+ radOut.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ };
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -153,6 +130,58 @@
_filterList = e.FilterList;
getPageList(1);
}
+
+ /// <summary>
+ /// 鐢熸垚棣栨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouJianClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1, "daa001");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾閲嶆柊鐢熸垚棣栨鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue ="",
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmitShouJian",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ //if (xtraTabControl1.SelectedTabPageIndex == 1)
+ //{
+ // getModel(lbGuid.Text.Trim());
+ //}
+ //else
+ //{
+ // //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ // getPageList(this.pageBar1.CurrentPage);
+ // int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ // gridView1.FocusedRowHandle = rowHandle;
+ //}
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
/// <summary>
/// 缁撴
/// </summary>
@@ -324,7 +353,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, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -388,8 +417,14 @@
//string cjId = dy.daa013;
//string xjxt = dy.sjXt;
// txt_sjXt.getSuppler(cjId, xjxt);
+ //鎵樻澘鐮�
+ txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
txt_kQty.Text = dy.kQty;
+ //杩芥函鐮�
+ txt_zQty98.Text = dy.daa008;
+ txt_yQty98.Text = dy.yQty98;
+ txt_kQty98.Text = dy.kQty98;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -468,6 +503,8 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
}
+ txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = "";
+ radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -580,16 +617,16 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ 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 (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍐呭寘瑁呮暟閲忥紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
txt_psnQty_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
@@ -597,7 +634,7 @@
this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ txt_printRemark.Text.Trim()
+ "," + ""
- + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -618,14 +655,15 @@
this.ucBtnPrint98.rptParameter = "return false";
return;
}
- if (string.IsNullOrEmpty(txt_iCount_98.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
txt_iCount_98.Focus();
this.ucBtnPrint98.rptParameter = "return false";
return;
}
- this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
+ this.ucBtnPrint98.rptParameter = "rpt_trace{"
+ + ""
+ "," + txt_printRemark98.Text.Trim()
+ "," + ""
+ "," + txt_iCount_98.Text.Trim()
@@ -648,9 +686,8 @@
this.ucBtnPrint100.rptParameter = "return false";
return;
}
-
- this.ucBtnPrint100.rptParameter = "rpt_trace{"
- + lbGuid.Text.Trim()
+ this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+ + "100"
+ "," + ""
+ "," + ""
+ "," + ""
@@ -691,8 +728,6 @@
}
}
}
-
#endregion
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3