From dd3064d7f5bb6c7d570f21e87b29012bfd95b1d2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 二月 2025 11:29:12 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 146 ++++++++++++++++++++++++++++++++----------------
1 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 2f106f0..7389bd1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -16,6 +16,11 @@
{
string _webServiceName = "MesItemQtManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucKh = "";//棰嗘枡瀹㈡埛
+ string _ucBm = "";//棰嗘枡閮ㄩ棬
+ string _ucCk = "";//鍙戞枡浠撳簱
+ string _ucHzlx = "";//璐т富绫诲瀷
+ string _ucHz = "";//璐т富
public Frm_MesItemQt()
{
InitializeComponent();
@@ -26,10 +31,11 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -42,20 +48,19 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆鍙戞枡缁勭粐
+ //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛�
txt_qt023.EditChanged += (s, e) =>
{
string _orgId = txt_qt023.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_qt008.getSuppler(_orgId);
- var _obj = new
- {
- currentPage = 1,
- everyPageSize = 999999,
- sortName = "",
- keyWhere = "",
- };
+ ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ txt_qt008.getSuppler(_orgId, _ucCk);
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -70,29 +75,35 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- //璁剧疆鍙戞枡浠撳簱
- //txt_qt008.getSuppler("");
- this.txt_qt008.EditChanged += (s, e) =>
- {
- string _ckId = txt_qt008.GetId();
- if (string.IsNullOrEmpty(_ckId))
- return;
- };
- //璁剧疆棰嗙敤
+ //閫夋嫨棰嗙敤缁勭粐
txt_qt024.EditChanged += (s, e) =>
{
string _orgId = txt_qt024.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- //txt_qt018.getSuppler(_orgId);
- //txt_qt009.getSuppler(_orgId);
+ txt_qt013.getSuppler(_orgId, _ucKh);
+ txt_qt009.getSuppler(_orgId,_ucBm);
};
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
+ }
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -222,6 +233,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ ucLookHuoZhu1.Enabled = true;
}
}
/// <summary>
@@ -237,6 +249,7 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ ucLookHuoZhu1.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -246,18 +259,39 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string inOrgId = txt_qt023.GetId();//鍙戞枡缁勭粐
- string inCkId = txt_qt008.GetId();//鍙戞枡浠撳簱
+ string inOrgId = txt_qt023.GetId();//搴撳瓨缁勭粐
+ string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷
+ string inHz = ucLookHuoZhu1.GetHzId();//璐т富
+ string inRkyy = txt_qt010.Text.Trim();//鍘熷洜
+ string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷
string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
- string inLyCus = txt_qt018.GetId();//棰嗙敤瀹㈡埛
- string inLyDepart = txt_qt018_1.GetId();//棰嗙敤閮ㄩ棬
+ string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
+ string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
+ string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
+ string inFlck = txt_qt008.GetId();//鍙戞枡浠撳簱
if (string.IsNullOrEmpty(inOrgId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
txt_qt023.Focus();
return;
}
- if (string.IsNullOrEmpty(inCkId))
+ if (string.IsNullOrEmpty(inHzlx))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(inHz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�");
+ return;
+ }
+ if (txt_qt019.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ txt_qt019.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(inFlck))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
txt_qt008.Focus();
@@ -274,17 +308,6 @@
Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
return;
}
- if (!string.IsNullOrEmpty(inLyCus) && !string.IsNullOrEmpty(inLyDepart))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ彧閫変竴涓紒");
- return;
- }
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
if (txt_qt020.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
@@ -294,14 +317,16 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- inDjlx = txt_qt019.Text.Trim(),//鍗曟嵁绫诲瀷
- inKcfx = txt_qt020.Text.Trim(),//搴撳瓨鏂瑰悜
- inOrgId = inOrgId,//鍙戞枡缁勭粐
- inCkId = inCkId,//鍙戞枡浠撳簱
+ inOrgId = inOrgId,//搴撳瓨缁勭粐
+ inHzlx = inHzlx,//璐т富绫诲瀷
+ inHz = inHz,//璐т富
+ inRkyy = inRkyy,//鍘熷洜
+ inDjlx = inDjlx,//鍗曟嵁绫诲瀷
inLyOrg = inLyOrg,//棰嗙敤缁勭粐
- inHzlx = txt_qt025.Text.Trim(),//璐т富绫诲瀷
- inLyCusOrDpt = inLyCus,//璐т富瀹㈡埛鎴栭儴闂�
- inRkyy = txt_qt010.Text.Trim(),//鍘熷洜
+ inLyCus = inLyCus,//棰嗙敤瀹㈡埛
+ inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
+ inKcfx = inKcfx,//搴撳瓨鏂瑰悜
+ inFlck = inFlck,//鍙戞枡浠撳簱
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -339,9 +364,14 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_qtck.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ ucLookHuoZhu1.Enabled = false;
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -414,10 +444,21 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucKh = dy.qt013;
+ _ucBm= dy.qt009;
+ _ucCk=dy.qt008;
+ _ucHzlx= dy.qt025;
+ _ucHz = dy.qt018;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ _ucKh = "";
+ _ucBm = "";
+ _ucCk = "";
+ _ucHzlx = "";
+ _ucHz = "";
+ ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -507,12 +548,16 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, parentForm, _inFieldValue.ToString());
}
}
catch (Exception ex)
@@ -529,6 +574,7 @@
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+ gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
--
Gitblit v1.9.3