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_Womdaahb.cs | 109 ++++++++++++++++++++++++++----------------------------
1 files changed, 53 insertions(+), 56 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaahb.cs
index 3279780..4c6570a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaahb.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaahb.cs
@@ -8,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -15,7 +16,7 @@
{
public partial class Frm_Womdaahb : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "WompbaManager/";
+ string _webServiceName = "WomdaahbManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
string _cjBm = "";//杞﹂棿
public Frm_Womdaahb()
@@ -66,10 +67,10 @@
{
if (string.IsNullOrEmpty(this.txt_daahb013.GetId()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨鐢熶骇宸ュ崟锛�");
return;
}
- var frm = new SelectWompba(this.txt_daahb013.GetId());
+ var frm = new SelectWomdaa(this.txt_daahb013.GetId(),this.txt_daahb015.GetId());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -79,14 +80,30 @@
lst = ee.StringList;
var _obj = lst;
var strReturn = UtilityHelper.HttpPost("",
- "WompbaManager/SelectPbaToView",
- JsonConvert.SerializeObject(_obj));
+ "WomdaaManager/SelectDaaToView",
+ JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
DataTable _newTable = dt.rtnData;
DataTable _oldTable = (DataTable)gcMx1.DataSource;
DataRow[] sourceRows = _newTable.Select();
+ DataRow[] sourceRowsOld = _oldTable.Select();
+ // 鑾峰彇褰撳墠鏈�澶х殑scheduleOrder鍊硷紙鏇村畨鍏ㄧ殑鍋氭硶锛�
+ int maxOrder = 0;
+ if (sourceRowsOld.Length > 0)
+ {
+ maxOrder = sourceRowsOld.Max(row =>
+ row.Table.Columns.Contains("scheduleOrder") ? Convert.ToInt32(row["scheduleOrder"]) : 0);
+ }
+
for (int i = 0; i < sourceRows.Length; i++)
{
+ // 纭繚鐩爣琛ㄤ篃鏈夎繖涓垪
+ if (sourceRows[i].Table.Columns.Contains("scheduleOrder") &&
+ _oldTable.Columns.Contains("scheduleOrder"))
+ {
+ // 浣跨敤maxOrder浣滀负鍩哄噯锛岃�屼笉鏄痵ourceRowsOld.Length
+ sourceRows[i]["scheduleOrder"] = maxOrder + 1 + i;
+ }
_oldTable.ImportRow(sourceRows[i]);
}
gcMx1.BindingContext = new BindingContext();
@@ -179,7 +196,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_daahb001, gridView1, "hNo");
+ lbGuid, txt_daahb001, gridView1, "daahb001");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -309,6 +326,7 @@
{
toolBarMenu1.isSetBtn = false;
string workId = txt_daahb013.GetId();
+ string lineId = txt_daahb015.GetId();
if (string.IsNullOrEmpty(workId.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
@@ -320,6 +338,7 @@
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
bz = txt_daahb009.Text.Trim(),
cjId = workId,
+ xtId = lineId,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -337,63 +356,21 @@
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
string _LineId = row["daa015"].ToString();
- if (string.IsNullOrEmpty(_LineId))
- {
- MsgHelper.ShowError("绾垮埆涓嶈兘涓虹┖锛�");
- return;
- }
- if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(row["daa008"].ToString()) <= 0)
- {
- MsgHelper.ShowError("璇疯緭鍏ユ纭殑鎺掍骇鏁伴噺锛�");
- return;
- }
string _Yjkgsj = row["mesStartProd"].ToString();
- if (string.IsNullOrEmpty(_Yjkgsj))
- {
- MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒");
- return;
- }
- //string _prepareTime = row["prepareTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("棰勮澶囨枡鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- //string _planPersonnel = row["planPersonnel"].ToString();
- //if (string.IsNullOrEmpty(_planPersonnel))
- //{
- // MsgHelper.ShowError("璁″垝浜烘暟锛�");
- // return;
- //}
- //string _changeLinetime = row["changeLinetime"].ToString();
- //if (string.IsNullOrEmpty(_changeLinetime))
- //{
- // MsgHelper.ShowError("鎹㈢嚎鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- string _mesEndProd = row["mesEndProd"].ToString();
- if (string.IsNullOrEmpty(_mesEndProd))
- {
- MsgHelper.ShowError("棰勮瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�");
- return;
- }
- //string _restTime = row["restTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("浼戞伅鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
_obj.list.Add(new
{
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
+ Rwdh = row["daa021"].ToString(),//浠诲姟鍗曞彿
+ Xh = row["scheduleOrder"].ToString(),//搴忓彿
+ Xsdh = row["caa015"].ToString(),//閿�鍞崟鍙�
+ Cpbm = row["itemNo"].ToString(),
+ Cpmc = row["daa003"].ToString(),
+ Cpgg = row["daa004"].ToString(),
+ Gdsl = row["daa008"].ToString(),//宸ュ崟鏁伴噺
LineId = row["daa015"].ToString(),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
- Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
Bz = row["daa009"].ToString(),//澶囨敞
- Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
- Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
});
}
@@ -490,6 +467,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);
_cjBm = "";
JObject _job = JObject.Parse(strJson);
@@ -510,6 +488,25 @@
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ JObject _job2 = JObject.Parse(strJson);
+ JArray array2 = new JArray();
+ foreach (var a2 in _job2["rtnData"]["list2"])
+ {
+ array2.Add(a2);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
}
else
@@ -623,7 +620,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daahb001, gridView1, "hNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daahb001, gridView1, "daahb001");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
--
Gitblit v1.9.3