From fbc8b8a3017797ca625669a1b57e5e8fee8c17c0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 18 四月 2025 17:01:17 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs | 127 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
index ddf4c99..cd27e66 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -100,7 +100,7 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -166,7 +166,6 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -189,7 +188,7 @@
getPageList(this.pageBar1.CurrentPage);
}
}
-
+
/// <summary>
/// 淇敼浜嬩欢
/// </summary>
@@ -228,57 +227,96 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _txt_djType = txt_djType.Text.Trim();
- string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
- string _txt_lifnr = txt_lifnr.Text.Trim();
- string _txt_suppId ="";
- string _txt_lineId ="";
- string _txt_itemId = txt_itemId11111.Text.Trim();
- string _txt_remarks = txt_remarks.Text.Trim();
- string _txt_workNo = txt_workNo.GetCode();
- string _txt_epTag = txt_epTag.Text.Trim();
+ string _freceQty = txt_freceQty.Text.Trim();
+ string _txt_fngHandle = txt_fngHandle.Text.Trim();
+ string _txt_fmrmode = txt_fmrmode.GetCode();
string _txt_fzrId = txt_fzrId.GetId();
+ string _txt_workNo = txt_workNo.Text.Trim();
string _txt_msg = txt_msg.TextTxt;
- string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
- string _txt_lotNo2 = txt_lotNo2.Text.Trim();
- string _txt_lotNo1 = txt_lotNo1.Text.Trim();
- string _txt_lotNo = txt_lotNo.Text.Trim();
- if (txt_djType.SelectedIndex <= 0)
+ string _txt_zrType = txt_zrType.Text.Trim();
+ if (txt_freceQty.SelectedIndex <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
- txt_djType.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
+ txt_freceQty.Focus();
return;
}
- if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
+ //褰撲负涓嶅悎鏍兼椂锛岃閫夋嫨澶勭疆缁撴灉
+ if (txt_freceQty.SelectedIndex != 1)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
- txt_fbatchQty.Focus();
- return;
+ if (txt_fngHandle.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭疆缁撴灉锛�");
+ txt_fngHandle.Focus();
+ return;
+ }
+ if (_txt_fzrId.Length <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换浜猴紒");
+ txt_fzrId.Focus();
+ return;
+ }
+
+ if (txt_zrType.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐ｄ换鍒ゅ畾锛�");
+ txt_zrType.Focus();
+ return;
+ }
+
+ //褰撳缃粨鏋滀负鍙嶅伐鏃讹紝瑕侀�夋嫨宸ュ簭鍜屽弽宸ョ紪鍙�
+ if (txt_fngHandle.SelectedIndex == 1)
+ {
+ if (string.IsNullOrEmpty(_txt_workNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～鍐欏弽宸ュ崟鍙凤紒");
+ txt_workNo.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_fmrmode))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇峰～閫夋嫨鍙嶅伐宸ュ簭锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(_txt_workNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕佸～鍐欏弽宸ュ崟鍙凤紒");
+ txt_workNo.Focus();
+ return;
+ }
+ if (!string.IsNullOrEmpty(_txt_fmrmode))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶉渶瑕侀�夋嫨鍙嶅伐宸ュ簭锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
}
- if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
+ //褰撲负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜�
+ else
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("宸ュ崟鍙蜂笉鑳戒负绌猴紒");
- txt_lotNo.Focus();
- return;
+ if ((_txt_fmrmode.Length + _txt_fzrId.Length + _txt_workNo.Length) > 0 || txt_zrType.SelectedIndex > 0 || txt_fngHandle.SelectedIndex > 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("褰撳垽瀹氱粨鏋滀负鍚堟牸鏃讹紝灏变笉搴旇閫夋嫨鍏跺畠椤圭洰浜嗭紒");
+ txt_freceQty.Focus();
+ return;
+ }
}
+
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- djType = _txt_djType,
- fbatchQty = _txt_fbatchQty,
- lifnr = _txt_lifnr,
- suppId = _txt_suppId,
- lineId = _txt_lineId,
- itemId = _txt_itemId,
- remarks = _txt_remarks,
- workNo = _txt_workNo,
- epTag = _txt_epTag,
+ freceQty = _freceQty,
+ fngHandle = _txt_fngHandle,
fzrId = _txt_fzrId,
+ workNo = _txt_workNo,
+ fmrmode = _txt_fmrmode,
msg = _txt_msg,
- fmanageNo = _txt_fmanageNo,
- lotNo2 = _txt_lotNo2,
- lotNo1 = _txt_lotNo1,
- lotNo = _txt_lotNo
+ zrType = _txt_zrType,
+ edtType = 1
};
try
{
@@ -288,7 +326,6 @@
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData.outGuid;
- txt_releaseNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
this.setEable(false);
@@ -386,6 +423,7 @@
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
ucUpFileList1.pGuid = lbGuid.Text.Trim();
+ ucChouJianList1.pGuid = lbGuid.Text.Trim();
if (guid5.Length > 10)
{
int rowHandle = 0;
@@ -417,6 +455,11 @@
private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
{
if (e.Page.Name == "tabMxPage2")
+ {
+ ucChouJianList1.getList14();
+
+ }
+ if (e.Page.Name == "tabMxPage3")
{
ucUpFileList1.getFileList();
}
@@ -522,7 +565,7 @@
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim(),"0");
+ getModel(lbGuid.Text.Trim(), "0");
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
--
Gitblit v1.9.3