From e19ea4337fa65725e6e22073a7b600dcc9887d4b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 07 四月 2025 08:27:54 +0800
Subject: [PATCH] 鸟嘴提示
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 329 +++++++++++++++++++++++++++---------------------------
1 files changed, 165 insertions(+), 164 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 2efc8bc..4163bde 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,4 +1,4 @@
-锘縰sing Gs.DevApp.DevFrm.QC;
+锘�
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -6,10 +6,7 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Net;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,13 +14,15 @@
{
public partial class Frm_FqcDetect01 : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "MesQaItemsDetect01Manager/";
+ string _webServiceName = "FqcManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_FqcDetect01()
{
InitializeComponent();
+ this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -33,27 +32,56 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value, "0");
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txtJianYan.KeyDown += TxtJianYan_KeyDown;
this.btnLoad.Click += BtnLoad_Click;
- ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
+ txt_suppId.getSuppler("");
+ txt_lineId.getSuppler("");
+ txt_itemId.Click += (s, e) =>
+ {
+ string _lineId = txt_lineId.GetId();
+ if (string.IsNullOrEmpty(_lineId))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛閫夋嫨浜х嚎锛�");
+ return;
+ }
+ var frm = new SelectFqcItem(_lineId);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ txt_itemId.Text = lst[0].itemId;
+ txt_itemModel.Text = lst[0].itemModel;
+ txt_itemName.Text = lst[0].itemName;
+ txt_itemNo.Text = lst[0].itemNo;
+ txt_lotNo.Text = lst[0].gdbh;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
}
+
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -63,7 +91,7 @@
private void BtnIpt_Click(object sender, EventArgs e)
{
bool bl = btnLoad.Enabled;
- Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
+ Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
frm.ShowDialog();
}
@@ -105,7 +133,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/ReloadModel5", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -165,7 +193,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EdtModel12",
+ "MesQaItemsDetect01Manager/EdtModel12",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
@@ -299,7 +327,49 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -321,6 +391,20 @@
//getPageList(1);
getPageList(this.pageBar1.CurrentPage);
}
+ }
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
/// 淇敼浜嬩欢
@@ -360,27 +444,85 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+ string _txt_djType = txt_djType.Text.Trim();
+ string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
+ string _txt_lifnr = txt_lifnr.Text.Trim();
+ string _txt_suppId = txt_suppId.GetId();
+ string _txt_lineId = txt_lineId.GetId();
+ string _txt_itemId = txt_itemId.Text.Trim();
+ string _txt_remarks = txt_remarks.Text.Trim();
+ string _txt_workNo = txt_workNo.GetCode();
+ string _txt_epTag = txt_epTag.Text.Trim();
+ string _txt_fzrId = txt_fzrId.GetId();
+ 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)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("澶囨敞鑳戒负绌猴紒");
- txt_remarks.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
+ txt_djType.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
+ txt_fbatchQty.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_lineId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浜х嚎涓嶈兘涓虹┖锛�");
+ txt_lineId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_itemId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧涓嶈兘涓虹┖锛�");
+ txt_itemId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_itemId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧涓嶈兘涓虹┖锛�");
+ txt_itemId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ txt_lotNo.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- fngDesc = "",
- remarks = txt_remarks.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,
+ fzrId = _txt_fzrId,
+ msg = _txt_msg,
+ fmanageNo = _txt_fmanageNo,
+ lotNo2 = _txt_lotNo2,
+ lotNo1 = _txt_lotNo1,
+ lotNo = _txt_lotNo
};
try
{
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)
{
- lbGuid.Text = _rtn.rtnData;
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_releaseNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
this.setEable(false);
@@ -436,7 +578,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid, string guid5)
{
@@ -478,7 +619,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
- ucUpFile1.parentGuid = lbGuid.Text.Trim();
+ ucUpFileList1.pGuid = lbGuid.Text.Trim();
if (guid5.Length > 10)
{
int rowHandle = 0;
@@ -487,7 +628,6 @@
rowHandle = 0;
gvMx1.FocusedRowHandle = rowHandle + 1;
}
- // MessageBox.Show(rowHandle.ToString() + "**" + guid5);
}
else
{
@@ -501,7 +641,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -513,44 +652,7 @@
{
if (e.Page.Name == "tabMxPage2")
{
- getFileList();
- }
- }
- /// <summary>
- /// 涓婁紶鍚庡埛鏂版枃浠跺垪琛�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void UcUpFile1_UpChanged(object sender, EventArgs e)
- {
- getFileList();
- }
- private void getFileList()
- {
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and parent_Guid='" + lbGuid.Text.Trim() + "'");
- PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString());
- string json = JsonConvert.SerializeObject(pgq);
- try
- {
- string strReturn = UtilityHelper.HttpPost("", "MesFile/GetListPage", json);
- ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMx4.BindingContext = new BindingContext();
- gcMx4.DataSource = dt;
- gcMx4.ForceInitialize();
- gvMx4.BestFitColumns();
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ucUpFileList1.getFileList();
}
}
/// <summary>
@@ -594,110 +696,9 @@
MsgHelper.Warning("鎻愮ず锛�" + 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 = gvMx4.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx4.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var strJson = "";
- var lst = new List<string>();
- lst.Add(mxGuid);
- try
- {
- strJson = UtilityHelper.HttpPost("", "MesFile/DeleteModel",
- JsonConvert.SerializeObject(lst));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) gvMx4.DeleteRow(rowhandle);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
- /// <summary>
- /// 娴忚闄勪欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- var rowhandle = gvMx4.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- try
- {
- var dr = gvMx4.GetDataRow(rowhandle);
- var urlPath = dr["urlPath"].ToString();
- Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
- frm.ShowDialog();
- }
- catch (Exception ex)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
- }
-
- }
- }
- /// <summary>
- /// 涓嬭浇闄勪欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- var rowhandle = gvMx4.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- try
- {
- var dr = gvMx4.GetDataRow(rowhandle);
- var urlPath = dr["urlPath"].ToString();
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- string _folderName = _folder + "\\" + urlPath;
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�");
- }
- }
- }
- catch (Exception ex)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
- }
- }
- }
-
+
private void setEable(bool bl)
{
-
txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
--
Gitblit v1.9.3