From af4607584464f3be49bca542d09f761ca9eb6329 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 18 九月 2025 16:01:03 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 7995916..94b88c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,6 @@
+using DevExpress.Data;
+using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.WOM;
@@ -9,6 +12,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -21,6 +25,7 @@
public Frm_Womdaa()
{
InitializeComponent();
+ //鍏堥殣钘�4绉嶆墦鍗�
this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
@@ -38,6 +43,9 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
this.toolBarMenu1.getXmlConfig();
+ gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+ gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+ Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -45,7 +53,6 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
- txt_daa015.getSuppler("");
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -124,32 +131,37 @@
lbGuid, txt_daa001, gridView1);
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�");
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction == "print")
{
- string rptParameter = "rpt_trace{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
//杩欐槸鍚庣洊鐮�
@@ -236,6 +248,7 @@
};
frm.ShowDialog();
};
+ //缁存姢瀹㈡埛妯＄増
this.btnDesign.Click += (s, e) =>
{
EasyRptEdtShow frm = new EasyRptEdtShow();
@@ -543,7 +556,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -604,6 +621,8 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ string lineId = dy.daa013;
+ txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
//鎵樻澘鐮�
txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
@@ -616,7 +635,6 @@
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);
@@ -720,7 +738,6 @@
continue;
}
}
-
//2025-7-20鍔犱笂浜х嚎纭璁板綍
JArray array6 = new JArray();
foreach (var a in _job["rtnData"]["list6"])
@@ -777,6 +794,9 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
}
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
+ txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
+ txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
+
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -1000,5 +1020,26 @@
+ "}";
}
#endregion
+
+ /// <summary>
+ /// 鍙樻洿鍐呭寘瑁呮暟閲�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptTuoBanNbz_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 frm = new Frm_WomdaaNbz(mxGuid);
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3