From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 09 六月 2025 09:53:37 +0800
Subject: [PATCH] 采购明细报表
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 325 +++++++++++++++++++++++++++++-------------------------
1 files changed, 174 insertions(+), 151 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 2d3ecbc..cb731d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -11,6 +6,11 @@
using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -19,12 +19,12 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
- public string strType = "";
+ public string strType = "";//iqc type
+ public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
public Jyxm(string _strType)
{
InitializeComponent();
strType = _strType;
-
}
protected override void OnCreateControl()
{
@@ -38,53 +38,66 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
+ //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
+ txt_ftype.Text = strType;
+ if (strType == "iqc")
+ dfValue = 5;
+ //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
+ if (strType != "ipqc宸℃")
+ {
+ gvMx1.Columns["stationName"].Visible = false;
+ }
+ //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
+ if (strType != "ipqc棣栨")
+ {
+ gvMx1.Columns["isRzxx"].Visible = false;
+ }
+ //鏂拌鍒濆鍊�
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
+ int newIndex = gvMx1.DataRowCount + 1;
+ this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
+ };
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
_setIno();
- btnSelect.Click += (s, e) =>
+ btnCopy.Click += (s, e) =>
{
- var frm = new SelectCheckDt("jyxm");
- frm.UpdateParent += (ss, ee) =>
+ if ((lbGuid.Text.Trim().Length < 10))
{
- var lst = ee.DynamicList;
- var json = JsonConvert.SerializeObject(lst);
- DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
- DataTable _oldTable = (DataTable)gridControl2.DataSource;
- DataRow[] sourceRows = _newTable.Select();
- for (int i = 0; i < sourceRows.Length; i++)
- {
- _oldTable.ImportRow(sourceRows[i]);
- }
- gridControl2.BindingContext = new BindingContext();
- gridControl2.DataSource = _oldTable;
- gridControl2.ForceInitialize();
- };
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+ return;
+ }
+ if ((txt_foneChecked.Checked == false))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+ return;
+ }
+ JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
frm.ShowDialog();
};
- btnSave.Click += BtnSave_Click;
-
}
-
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -106,10 +119,15 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -124,14 +142,16 @@
_filterList = e.FilterList;
getPageList(1);
}
+
/// <summary>
- /// 鎵瑰噯
+ /// 鍙嶅鏍�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- _toolCk(2);
+ _toolCk(0);
}
/// <summary>
@@ -209,7 +229,6 @@
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- gvList.Add(gridView2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
@@ -225,10 +244,8 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
- gridViews.Add(gridView2);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- xtraTabPageCopy.PageEnabled = false;
}
/// <summary>
@@ -239,7 +256,7 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _ItemId = txt_itemId.GetId();
+ string _ItemId = txt_itemId.EditValue.ToString().Trim();
if (string.IsNullOrEmpty(_ItemId))
{
MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -292,13 +309,21 @@
MsgHelper.ShowError("鎺ュ彈姘村钩涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["ypsl"].ToString()))
+ {
+ MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+ return;
+ }
string _Fstand = row["Fstand"].ToString();
string _FupAllow = row["FupAllow"].ToString();
string _FdownAllow = row["FdownAllow"].ToString();
+ string _isRzxxTxt = row["isRzxx"].ToString();
+ bool _isRzxx = false;
+ if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
+ _isRzxx = true;
//鍋囧涓変釜閮戒负绌洪�氳繃
if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
{
-
}
else
{
@@ -334,7 +359,10 @@
Memo = row["memo"].ToString(),
FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
- FqaType = this.strType,
+ ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ stationName = row["stationName"].ToString(),
+ FcheckType = row["FcheckType"].ToString(),
+ isRzxx = _isRzxx,
});
}
}
@@ -344,8 +372,8 @@
ItemId = long.Parse(_ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
- Ftype = "1",
- Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
+ Ftype = this.strType,
+ Fversion = 0,
list = lst
};
try
@@ -362,8 +390,9 @@
toolBarMenu1.isSetBtn = true;
var gridViews = new List<GridView>();
gridViews.Add(gvMx1);
- gridViews.Add(gridView2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -375,7 +404,6 @@
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -384,8 +412,9 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
+ _sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
"org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -405,7 +434,7 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -424,7 +453,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -435,7 +467,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- xtraTabPageCopy.PageEnabled = !isEdit;
var _obj = new
{
guid = strGuid //涓诲缓
@@ -453,8 +484,7 @@
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy,
- isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -465,12 +495,12 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
- UtilityHelper.SetDefaultTable(gridControl2, gridView2);
}
else
{
@@ -494,6 +524,9 @@
{
case -1:
strMsg = "鍒犻櫎";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
break;
case 1:
strMsg = "瀹℃牳";
@@ -523,23 +556,28 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
+ if (_inFieldValue < 0 && _rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ }
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
- Form parentForm = this.FindForm();
- UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue > 0 ? "1" : "0");
}
- else
- {
- //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
- getPageList(this.pageBar1.CurrentPage);
- int rowHandle = gridView1.LocateByValue("guid", rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
}
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
@@ -550,28 +588,37 @@
#region 浠ヤ笅涓虹绉嶄笅鎷�
private void _setIno()
{
- this.txt_fSubsidiary.EditChanged += (s, e) =>
+ txt_itemId.Click += (s, e) =>
{
- string _orgId = txt_fSubsidiary.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
- txt_itemId.getSuppler(_orgId);
- //txt_gg.Text ="";
- //txt_itemNo.Text = "";
- };
- txt_itemId.EditChanged += (s, e) =>
- {
- if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
- txt_gg.Text = this.txt_itemId.GetModel();
- if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
- txt_itemNo.Text = this.txt_itemId.GetCode();
+ var frm = new JyxmShow(this.strType);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ txt_itemId.Text = lst[0].itemId;
+ txt_gg.Text = lst[0].itemModel;
+ txt_mc.Text = lst[0].itemName;
+ txt_itemNo.Text = lst[0].itemNo;
+ txt_fSubsidiary.Text = lst[0].fSubsidiary;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
_getListJyxm();
_getListJygj();
_getListJybz();
_getListJssp();
_getListJysp();
+ _getListStation();
+ _getListGroup();
}
+
/// <summary>
/// 璇诲彇妫�楠岄」鐩�
/// </summary>
@@ -593,7 +640,32 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇妫�楠屽伐浣�
+ /// </summary>
+ private void _getListStation()
+ {
+ string _where = " and 1=1 and s_type='宸ヤ綅淇℃伅' and pid<>'00000000-0000-0000-0000-000000000000'";
+ var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ //tlMenu.KeyFieldName = "guid";
+ //tlMenu.ParentFieldName = "pid";
+ rptStation.Items.Add(dr["defectName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 璇诲彇妫�楠屽伐鍏�
/// </summary>
@@ -632,8 +704,6 @@
foreach (DataRow dr in dt.Rows)
{
rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
- //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
- //string ddddd = dr["SampleSizeName"].ToString();
}
}
catch (Exception ex)
@@ -648,8 +718,8 @@
{
rptJSSP.Items.AddRange(new string[] {
"0.010---(AQL_0_0010)"
- , "0.015---(AQL_0_0015)"
- , "0.025---(AQL_0_0025)"
+ ,"0.015---(AQL_0_0015)"
+ ,"0.025---(AQL_0_0025)"
,"0.040---(AQL_0_0040)"
,"0.065---(AQL_0_0065)"
,"0.10---(AQL_0_010)"
@@ -678,7 +748,22 @@
,"7.鐗规畩妫�楠屾按骞�(S4)"
});
}
-
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListGroup()
+ {
+ rptGroup.Items.AddRange(new string[] {
+ "澶栬"
+ ,"棰滆壊"
+ ,"灏哄"
+ , "鍏抽敭閮ㄤ欢涓�鑷存��"
+ , "鍝佹按娴嬭瘯"
+ ,"鍒剁儹鎬ц兘"
+ ,"杩涙按鍘嬪姏"
+ ,"鐢垫皵鎬ц兘"
+ });
+ }
/// <summary>
/// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
/// </summary>
@@ -700,6 +785,11 @@
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
}
}
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
@@ -737,72 +827,5 @@
}
}
#endregion
- /// <summary>
- /// 鍒犻櫎澶嶅埗椤�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- gridView2.CloseEditor();
- gridView2.UpdateCurrentRow();
- var rowhandle = gridView2.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gridView2.GetDataRow(rowhandle);
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- gridView2.DeleteRow(rowhandle);
- return;
- }
- }
- /// <summary>
- /// 鎻愪氦鐗╂枡澶嶅埗
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void BtnSave_Click(object sender, EventArgs e)
- {
- int _rows = gridView2.RowCount;
- if (_rows <= 0)
- {
- MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
- return;
- System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
- for (var i = 0; i < gridView2.DataRowCount; i++)
- {
- var row = gridView2.GetDataRow(i);
- if (_sbGuids.Length > 0)
- _sbGuids.Append(",");
- Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- _sbGuids.Append(_guid.ToString());
- }
- var _obj = new
- {
- sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- itemGuids = _sbGuids.ToString()
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.SetDefaultTable(gridControl2, gridView2);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
}
}
\ No newline at end of file
--
Gitblit v1.9.3