From 8c7ac11905cc442d9cf8920de01dc5ef29179987 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期一, 01 九月 2025 17:48:50 +0800
Subject: [PATCH] 工单撤回报工条码选择
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs | 120 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 98 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
index 52d95f2..12bf154 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.cs
@@ -1,6 +1,4 @@
-锘�
-using Gs.DevApp.DevFrm.QC;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -42,6 +40,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
@@ -61,9 +60,10 @@
foreach (dynamic dym in lst)
{
DataRow _row = _Table.NewRow();
- _row["fSeq"] = dym.fSeq;
- _row["statStatus"] = "Y-鏄�";
- _row["collectionName"] = "绌�";
+ //_row["fSeq"] = dym.fSeq;
+ _row["signingFlag"] = false;
+ _row["storageFlag"] = true;
+ _row["frontProcessNo"] = "绌�";
_row["processNo"] = dym.processNo;
_row["processName"] = dym.processName;
_Table.Rows.Add(_row);
@@ -241,6 +241,7 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
this.btnCopy.Enabled = true;
}
@@ -305,16 +306,10 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- //fType = txt_fType.Text.Trim(),
- //fBegDate = txt_fBegDate.Text.Trim(),
- //fEndDate = txt_fEndDate.Text.Trim(),
- //fJingDu = txt_fJingDu.Text.Trim(),
- //fCapacity = txt_fCapacity.Text.Trim(),
- //fMaxWeight = txt_fMaxWeight.Text.Trim(),
- //fMinWeight = txt_fMinWeight.Text.Trim(),
- //fSumPeople = txt_fSumPeople.Text.Trim(),
- //remark = txt_remark.Text.Trim(),
+ orgName=txt_orgName.Text.Trim(),
+ itemNo=txt_itemNo.Text.Trim(),
list = new List<dynamic>(),
+ list2 = new List<dynamic>(),
};
gvMx1.CloseEditor();
gvMx1.PostEditor();
@@ -326,15 +321,39 @@
{
_obj.list.Add(new
{
- fSeq = row["fSeq"].ToString(),//搴忓彿
+ guid = row["guid"].ToString(),//搴忓彿
processNo = row["processNo"].ToString(),//宸ュ簭缂栧彿
- remark = row["gxOrder"].ToString(),//宸ュ簭椤哄簭鍙�
- statStatus = (row["signingFlag"].ToString()),//鎶ュ伐鏍囪瘑
- collectionName = row["storageFlag"].ToString(),//鍏ュ簱鏍囪瘑
+ gxOrder = row["gxOrder"].ToString(),//宸ュ簭椤哄簭鍙�
+ signingFlag = row["signingFlag"].ToString(),//鎶ュ伐鏍囪瘑
+ storageFlag = row["storageFlag"].ToString(),//鍏ュ簱鏍囪瘑
frontProcessNo = row["frontProcessNo"].ToString(),//涓婂伐搴忓彿
});
}
+
}
+
+ gvMx2.CloseEditor();
+ gvMx2.PostEditor();
+ gvMx2.UpdateCurrentRow();
+ for (var i = 0; i < gvMx2.DataRowCount; i++)
+ {
+ var row2 = gvMx2.GetDataRow(i);
+ if (row2 != null)
+ {
+ _obj.list2.Add(new
+ {
+ guid = row2["guid"].ToString(),//涓婚敭
+ workers = row2["workers"].ToString(),//鏍囧噯浜烘暟
+ hours = row2["hours"].ToString(),//鏍囧噯宸ユ椂
+ capacity = (row2["capacity"].ToString()),//鍗曞皬鏃朵骇鑳�
+ sCapacity = row2["sCapacity"].ToString(),//鏍囧噯浜ц兘
+ lineType = row2["lineType"].ToString(),//绾夸綋绫诲埆
+ changeTime = row2["changeTime"].ToString(),//鎹㈢嚎鏃堕棿
+ });
+ }
+
+ }
+
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
@@ -345,9 +364,20 @@
toolBarMenu1.isSetBtn = true;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
toolBarMenu1.currentAction = "";
- //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+
+ //if (xtraTabControl1.TabPages.Count > 6)
+ //{
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ //}
+ //else
+ //{
+ // MessageBox.Show($"褰撳墠鍙湁 {xtraTabControl1.TabPages.Count} 涓�夐」鍗★紝鏃犳硶璺宠浆鍒扮7涓�");
+ //}
+
}
}
catch (Exception ex)
@@ -404,6 +434,7 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
this.btnCopy.Enabled = true;
JObject _job = JObject.Parse(strJson);
@@ -550,11 +581,56 @@
}
/// <summary>
+ /// 绉诲嚭浜ц兘
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_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 mxGuid2 = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid2))
+ {
+ gvMx2.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),//杩欐槸浜у搧鐨刧uid
+ mxGuid2 = mxGuid2,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteMode2OrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ /// <summary>
/// 璇诲彇宸ュ簭涓嬫媺
/// </summary>
private void _getListJyxm()
{
- var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", "");
+ var pgq = new PageQueryModel(1, 999999, "a.PROC_NO", "asc", "", "");
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -564,7 +640,7 @@
rptGx.Items.Add("绌�");
foreach (DataRow dr in dt.Rows)
{
- rptGx.Items.Add(dr["processNo"].ToString());
+ rptGx.Items.Add(dr["procNo"].ToString());
}
}
catch (Exception ex)
--
Gitblit v1.9.3