From 3fc14442d71276fe3fb98f66b115fa249b921b37 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 六月 2025 08:08:53 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 361 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 280 insertions(+), 81 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 9a8890b..6b38daa 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,5 +1,4 @@
-using DevExpress.XtraPivotGrid.Data;
-using Gs.DevApp.DevFrm.WOM;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +19,9 @@
public Frm_Womdaa()
{
InitializeComponent();
+ this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
+ this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
+ this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
// this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -31,6 +33,7 @@
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -49,44 +52,171 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
- //杩欐槸鎵樻澘鐮�
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
- {
- ucBtnPrint1.rptParameter = "rpt_daa{}";
- };
- 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);
+ 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) =>
+ //杩欐槸鎵樻澘鐮�
+ this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- ucBtnPrint98.rptParameter = "rpt_trace{}";
+ _print();
};
- this.ucBtnPrint98.btnReportClick += (s, e) =>
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鎵樻澘鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_daa{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ //杩欐槸杩芥函鐮�
+ this.ucBtnPrint98.btnPrintClick += (s, e) =>
{
_print98();
};
- //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
- this.ucBtnPrint100.btnDesignClick += (s, e) =>
+ this.ucBtnPrint98.btnAllClick += (s, e) =>
{
- ucBtnPrint100.rptParameter = "rpt_hgm{}";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
};
- this.ucBtnPrint100.btnReportClick += (s, e) =>
+ //杩欐槸鍚庣洊鐮�
+ this.ucBtnPrint100.btnPrintClick += (s, e) =>
{
_print100();
};
- }
+ this.ucBtnPrint100.btnAllClick += (s, e) =>
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍚庣洊鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_hgm{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+ this.ucBtnPrint101.SetPlButton(false);
+ this.ucBtnPrint101.btnPrintClick += (s, e) =>
+ {
+ _print101();
+ };
+ //瀵煎叆妯℃澘
+ this.btnIn.Click += (s, e) =>
+ {
+ //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+ string upGuid = Guid.NewGuid().ToString();
+ string strService = "XlsInDaaHgm";
+ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var _obj = new
+ {
+ tmpGuid = upGuid,
+ strType = "",
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("",
+ "XlsInOut/" + strService,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
+ }
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -129,6 +259,49 @@
getPageList(1);
}
+ /// <summary>
+ /// 鍒犻櫎宸ュ崟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnDelClick(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,
+ mxGuid = Guid.Empty.ToString(),
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 鐢熸垚棣栨
/// </summary>
@@ -179,7 +352,7 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
_toolCk(7);
@@ -192,6 +365,11 @@
{
_toolCk(9);
}
+ /// <summary>
+ /// 宸ュ崟鐘舵�侊紝鏍规嵁鍒嗗彿鎶婁腑鏂囧幓浜�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
{
var frm = new showZhongTai();
@@ -201,14 +379,6 @@
_toolCk(_zt);
};
frm.ShowDialog();
- }
- private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
- {
- _toolCk(7);
- }
- private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
- {
- _toolCk(8);
}
/// <summary>
/// 鏃ュ織
@@ -402,6 +572,11 @@
txt_zQty98.Text = dy.daa008;
txt_yQty98.Text = dy.yQty98;
txt_kQty98.Text = dy.kQty98;
+ //鍚庣洊鐮�
+ txt_zQty100.Text = dy.daa008;
+ txt_yQty100.Text = dy.yQty100;
+ txt_kQty100.Text = dy.kQty100;
+
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -480,7 +655,33 @@
{
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 = txt_yuliang_1.Text="";
+ //鍔犱笂鎵撳嵃鏉冮檺
+ JArray array5 = new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
+ {
+ if (a["blackName"].ToString() == "鎵樻澘鐮佹墦鍗�")
+ {
+ splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "杩芥函鐮佹墦鍗�")
+ {
+ splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "鍚庣洊鐮佹墦鍗�")
+ {
+ splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "榻愬鏍囪瘑鍗℃墦鍗�")
+ {
+ xtraTabPage5.PageVisible = true;
+ continue;
+ }
+ }
+
+ 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);
@@ -500,9 +701,9 @@
string strMsg = "";
switch (_inFieldValue)
{
- case 1:
- strMsg = "寰呭紑宸�";
- break;
+ //case 1:
+ // strMsg = "寰呭紑宸�";
+ // break;
case 2:
strMsg = "宸ュ崟鏆傚仠";
break;
@@ -515,15 +716,15 @@
case 5:
strMsg = "鏆傚仠澶囨枡";
break;
- case 6:
- strMsg = "鎾ゅ洖澶囨枡";
- break;
+ //case 6:
+ // strMsg = "鎾ゅ洖澶囨枡";
+ // break;
case 7:
strMsg = "閫氱煡澶囨枡";
break;
- case 8:
- strMsg = "寮�宸�";
- break;
+ //case 8:
+ // strMsg = "寮�宸�";
+ // break;
case 9:
strMsg = "鎵嬪姩瀹屽伐";
break;
@@ -591,9 +792,9 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
txt_iCount_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
@@ -608,7 +809,7 @@
this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ txt_printRemark.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -631,7 +832,7 @@
}
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;
@@ -646,7 +847,7 @@
}
/// <summary>
- /// 杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+ /// 杩欐槸鍚庣洊鐮�
/// </summary>
private void _print100()
{
@@ -660,48 +861,46 @@
this.ucBtnPrint100.rptParameter = "return false";
return;
}
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_100.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_100.Focus();
+ this.ucBtnPrint100.rptParameter = "return false";
+ return;
+ }
this.ucBtnPrint100.rptParameter = "rpt_hgm{"
- + "100"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + txt_iCount_100.Text.Trim()
+ + "," + 1
+ + "}";
+ }
+
+ /// <summary>
+ /// 杩欐槸榻愬
+ /// </summary>
+ private void _print101()
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ ucBtnPrint101.guidKey = rowGuid;
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint101.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint101.rptParameter = "rpt_qitao{"
+ + ""
+ "," + ""
+ "," + ""
+ "," + ""
+ "," + ""
+ "}";
}
- private void repositoryItemButtonEdit1_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 = "daa"
- };
- 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);
- }
- }
- }
+
#endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3