From cdca5a70b3fac5f804a6eabb7a3976f8c00e35e8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 16:40:30 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 231 ++++++++-------------------------------------------------
1 files changed, 35 insertions(+), 196 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 87d1ea3..cb7bc02 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,21 +1,13 @@
-锘縰sing DevExpress.Utils;
-using DevExpress.XtraGrid.Views.Base;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Drawing;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm.FQC
{
@@ -39,11 +31,10 @@
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");
@@ -55,7 +46,6 @@
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;
@@ -279,7 +269,7 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_releaseNo, gridView1, "lotNo");
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
@@ -290,9 +280,9 @@
return;
if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
{
- if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+ if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
{
- MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+ MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰～鍐欒繚瑙勪俊鎭紒");
return;
}
};
@@ -414,6 +404,7 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ this.ucUpFileList1.pGuid = "";
}
/// <summary>
/// 淇敼浜嬩欢
@@ -453,21 +444,18 @@
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 = 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();
+ 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();//瀹㈡埛id
+ string _txt_lineId = txt_lineId.GetId();//浜х嚎
+ string _txt_itemId = txt_itemId.Text.Trim();//浜у搧
+ string _txt_remarks = txt_remarks.Text.Trim();//澶囨敞
+ string _txt_epTag = txt_epTag.Text.Trim();//鐜繚
+ string _txt_msg = txt_msg.TextTxt;//寮傚父
+ string _txt_fmanageNo = txt_fmanageNo.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("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
@@ -492,12 +480,6 @@
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("宸ュ崟鍙蜂笉鑳戒负绌猴紒");
@@ -507,21 +489,19 @@
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,
- fzrId = _txt_fzrId,
- msg = _txt_msg,
- fmanageNo = _txt_fmanageNo,
- lotNo2 = _txt_lotNo2,
- lotNo1 = _txt_lotNo1,
- lotNo = _txt_lotNo
+ djType = _txt_djType,//鍗曟嵁绫诲瀷
+ fbatchQty = _txt_fbatchQty,//鎶芥鏁伴噺
+ lifnr = _txt_lifnr,//瀹㈡埛璁㈠崟
+ suppId = _txt_suppId,//瀹㈡埛id
+ lineId = _txt_lineId,//浜х嚎
+ itemId = _txt_itemId,//浜у搧
+ remarks = _txt_remarks,//澶囨敞
+ epTag = _txt_epTag,//鐜繚
+ msg = _txt_msg,//寮傚父
+ fmanageNo = _txt_fmanageNo,//娴佺▼缂栧彿
+ lotNo1 = _txt_lotNo1,//閫佹鎵瑰彿
+ lotNo = _txt_lotNo,//鐢熶骇宸ュ崟
+ edtType = 0
};
try
{
@@ -537,6 +517,7 @@
this.setEable(false);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ getModel(lbGuid.Text,"0");
}
}
catch (Exception ex)
@@ -628,7 +609,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;
@@ -637,7 +618,6 @@
rowHandle = 0;
gvMx1.FocusedRowHandle = rowHandle + 1;
}
- // MessageBox.Show(rowHandle.ToString() + "**" + guid5);
}
else
{
@@ -651,7 +631,6 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -663,46 +642,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()
- {
- if (lbGuid.Text.Length <= 10)
- return;
- 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>
@@ -746,113 +686,12 @@
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 ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3