From 9bf3c63bde1ecbcd13a21c297ae7abe991aece5d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 19 二月 2025 16:48:01 +0800
Subject: [PATCH] 委外排产
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 8 ++++----
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs | 10 +++++++++-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 38 ++++++++++++++++++++++++++++----------
3 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 0c0d774..c7f0089 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -17,6 +17,7 @@
{
string _webServiceName = "WompbaManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _cjBm = "";//杞﹂棿
public Frm_Wompba()
{
InitializeComponent();
@@ -29,11 +30,13 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gridView1);
+ gvList.Add(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "fstatus", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -46,10 +49,15 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- this.txt_pba013.getSuppler("");
- txt_erpSczz.EditChanged += (s, e) => {
- txt_pba013.getSuppler(txt_erpSczz.GetId());
+ //閫夊瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜岃溅闂达級
+ txt_erpSczz.EditChanged += (s, e) =>
+ {
+ string _orgId = txt_erpSczz.GetId();
+ if (string.IsNullOrEmpty(_orgId))
+ return;
+ txt_pba013.getSuppler(_orgId, _cjBm);
};
+ // 閫夋嫨杞﹂棿锛堝彉鏄庣粏涓骇绾匡級
txt_pba013.EditChanged += (s, e) =>
{
string workGuid = this.txt_pba013.GetId();
@@ -125,7 +133,15 @@
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
-
+ }
+ private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
+ {
+ string _formNamespace = this.GetType().FullName;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ gvList.Add(gvMx1);
+ Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
+ DevFrm.ShowDialog();
}
/// <summary>
/// 鏌ヨ鍥炶皟
@@ -234,7 +250,7 @@
_toolCk(0, "EditModelSubmitFSH");
}
-
+
/// <summary>
/// 淇敼浜嬩欢
/// </summary>
@@ -387,6 +403,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -460,10 +477,12 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _cjBm = dy.pba013;
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);
+ _cjBm = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -540,7 +559,7 @@
rptJYBZ.Items.Clear();
if (string.IsNullOrEmpty(workGuid))
return;
- var _sbSqlWhere = " and 1=1 and dpt_id="+ workGuid;
+ var _sbSqlWhere = " and 1=1 and dpt_id=" + workGuid;
var pgq = new PageQueryModel(1, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -608,8 +627,7 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth,
- JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth,JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
index 9af0460..c654b40 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
@@ -38,8 +38,13 @@
if (EditChanged != null) EditChanged(this, e);
}
- public void getSuppler(string orgId="")
+ /// <summary>
+ /// 璇诲彇杞﹂棿
+ /// </summary>
+ /// <param name="orgId"></param>
+ public void getSuppler(string orgId="", string _dftVale = "")
{
+ lookSearchSupplier.EditValue = null;
var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1 and a.FSubsidiary=" + orgId);
var json = JsonConvert.SerializeObject(pgq);
try
@@ -50,6 +55,9 @@
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "departmentname";
lookSearchSupplier.Properties.ValueMember = "departmentid";
+ lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ if (!string.IsNullOrEmpty(_dftVale))
+ SetIdOrCode(_dftVale);
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 2a95032..b216ae3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -152,8 +152,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -475,7 +475,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 66);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -504,7 +504,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 66);
+ this.Size = new System.Drawing.Size(1543, 68);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
--
Gitblit v1.9.3