From 1b799e1d64e6a2e151f52092542c6892ea858f0c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 09 五月 2025 13:13:56 +0800
Subject: [PATCH] 工序采集
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 114 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 45 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 345132a..f2e01a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,5 @@
+using DevExpress.XtraPivotGrid.Data;
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -27,9 +29,8 @@
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
- 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);
@@ -48,8 +49,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
- //杩欐槸鍗℃澘鐮�
+ //杩欐槸鎵樻澘鐮�
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -57,6 +57,14 @@
this.ucBtnPrint1.btnReportClick += (s, e) =>
{
_print();
+ };
+ txt_psnQty_1.TextChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut,txt_yuliang_1);
+ };
+ radOut.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
//杩欐槸杩芥函鐮�
this.ucBtnPrint98.btnDesignClick += (s, e) =>
@@ -75,15 +83,6 @@
this.ucBtnPrint100.btnReportClick += (s, e) =>
{
_print100();
- };
- 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);
};
}
@@ -127,27 +126,58 @@
_filterList = e.FilterList;
getPageList(1);
}
+
/// <summary>
- /// 缁撴
+ /// 鐢熸垚棣栨
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
/// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
+ 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>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
-
- private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
- {
- _toolCk(99);
- }
+
private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
_toolCk(7);
@@ -298,7 +328,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
@@ -448,8 +478,7 @@
{
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 = "鍏ㄨ嚜鍔�";
+ txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -476,7 +505,7 @@
strMsg = "宸ュ崟鏆傚仠";
break;
case 3:
- strMsg = "鎾ゅ洖瀹屽伐";
+ strMsg = "娓呭熬";
break;
case 4:
strMsg = "绱ф�ュ鏂�";
@@ -496,9 +525,6 @@
case 9:
strMsg = "鎵嬪姩瀹屽伐";
break;
- case 99:
- strMsg = "缁撴";
- break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -511,6 +537,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+
var _obj = new
{
guid = rowGuid,
@@ -562,16 +589,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("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ 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;
@@ -579,7 +606,7 @@
this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ txt_printRemark.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -600,14 +627,14 @@
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("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ 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()
+ "," + ""
@@ -631,7 +658,6 @@
this.ucBtnPrint100.rptParameter = "return false";
return;
}
-
this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+ "100"
+ "," + ""
@@ -674,8 +700,6 @@
}
}
}
-
#endregion
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3