From daebf2c2a4f1cbbf310e9d739c2ed198cfc5865e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 22 七月 2025 08:26:53 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 269 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 250 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 0c55abc..92bdf28 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.Utils.MVVM.Services;
-using DevExpress.XtraPrinting.Native;
+锘縰sing Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -11,12 +10,13 @@
using System.Threading.Tasks;
using System.Windows.Forms;
+
namespace Gs.DevApp.DevFrm.Work
{
public partial class Frm_WorkTechnique : DevExpress.XtraEditors.XtraForm
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
- private readonly string _webServiceName = "MesItemsManager/";
+ private readonly string _webServiceName = "WorkTechnique/";
public Frm_WorkTechnique()
{
InitializeComponent();
@@ -36,6 +36,8 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
@@ -48,7 +50,6 @@
btnSelect.Click += (s, e) =>
{
var frm = new SelectProcess();
- //璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
try
@@ -58,8 +59,9 @@
foreach (dynamic dym in lst)
{
DataRow _row = _Table.NewRow();
- _row["guid"] = "";
- _row["pGuid"] = "";
+ _row["fSeq"] = dym.fSeq;
+ _row["statStatus"] = "Y-鏄�";
+ _row["collectionName"] = "绌�";
_row["processNo"] = dym.processNo;
_row["processName"] = dym.processName;
_Table.Rows.Add(_row);
@@ -70,12 +72,30 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
};
+ frm.ShowDialog();
+ };
+ _getListJyxm();
+ //澶嶅埗
+ btnCopy.Click += (s, e) =>
+ {
+ if ((lbGuid.Text.Trim().Length < 10))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+ return;
+ }
+ if ((txt_isCheck.Checked == false))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+ return;
+ }
+ Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim());
frm.ShowDialog();
};
}
@@ -152,14 +172,14 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
+ "MesItemsManager/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -186,8 +206,29 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -199,6 +240,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ this.btnCopy.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -208,6 +250,56 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ if (txt_fType.SelectedIndex <0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
+ txt_fType.Focus();
+ return;
+ }
+ if (txt_fJingDu.SelectedIndex < 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("绠＄悊绮惧害涓嶈兘涓虹┖锛�");
+ txt_fJingDu.Focus(); return;
+ }
+ if (txt_fBegDate.Text.Length <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
+ txt_fBegDate.Focus(); return;
+ }
+ txt_fEndDate.DateTime= new DateTime(2099, 1, 1);
+ if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
+ txt_fEndDate.Focus(); return;
+ }
+ decimal num = 0;
+ int num2 = 0;
+ if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑瀹氬憳锛�");
+ txt_fSumPeople.Focus(); return;
+ }
+ if (!decimal.TryParse(txt_fCapacity.Text.Trim(), out num))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑浜ц兘锛�");
+ txt_fCapacity.Focus(); return;
+ }
+ if (!decimal.TryParse(txt_fMaxWeight.Text.Trim(), out num))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑閲嶉噺涓婇檺锛�");
+ txt_fMaxWeight.Focus(); return;
+ }
+ if (!decimal.TryParse(txt_fMinWeight.Text.Trim(), out num))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑閲嶉噺涓嬮檺锛�");
+ txt_fMinWeight.Focus(); return;
+ }
+ //涓婇檺涓嶈兘浣庝簬涓嬮檺
+ if (decimal.Parse(txt_fMaxWeight.Text.Trim()) < decimal.Parse(txt_fMinWeight.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("涓婇檺涓嶈兘浣庝簬涓嬮檺锛�");
+ txt_fMaxWeight.Focus(); return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -245,19 +337,22 @@
{
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);
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
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);
}
}
@@ -268,10 +363,21 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ getModel(rowGuid);
+
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -279,7 +385,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -289,7 +395,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- "WorkTechnique/GetModel",
+ _webServiceName + "GetModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
@@ -299,6 +405,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ this.btnCopy.Enabled = true;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -317,15 +424,139 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ UtilityHelper.SetCheckIco(null, "", "", "", picCheckBox, this, (txt_isCheck.Checked == true ? 1 : 0).ToString());
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 绉诲嚭宸ュ簭
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//杩欐槸浜у搧鐨刧uid
+ mxGuid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 璇诲彇宸ュ簭涓嬫媺
+ /// </summary>
+ private void _getListJyxm()
+ {
+ var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", "");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "WorkPro/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = dd.rtnData.list;
+ rptGx.Items.Add("绌�");
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptGx.Items.Add(dr["processNo"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3