From 57012239858595c37e463c1461b7a34949a6b6d6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 二月 2025 11:27:44 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 69 +++++++++++++++-------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 64 +++++++++-----------
2 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index e04cbe6..a246271 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -67,10 +67,8 @@
this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
this.gv_fCreatorId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fStockOrgId = new DevExpress.XtraEditors.LabelControl();
- this.txt_fStockOrgId = new DevExpress.XtraEditors.TextEdit();
this.gv_fStockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fSaleOrgId = new DevExpress.XtraEditors.LabelControl();
- this.txt_fSaleOrgId = new DevExpress.XtraEditors.TextEdit();
this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fBillTypeID = new DevExpress.XtraEditors.LabelControl();
this.txt_fBillTypeID = new DevExpress.XtraEditors.TextEdit();
@@ -93,6 +91,8 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
+ this.txt_fSaleOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -105,8 +105,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
@@ -217,7 +215,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 112);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 377);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -226,7 +224,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 112);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 377);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -555,15 +553,6 @@
this.lb_fStockOrgId.TabIndex = 217;
this.lb_fStockOrgId.Text = "鍙戣揣缁勭粐 ";
//
- // txt_fStockOrgId
- //
- this.txt_fStockOrgId.Location = new System.Drawing.Point(80, 52);
- this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fStockOrgId.Properties.Appearance.Options.UseFont = true;
- this.txt_fStockOrgId.Size = new System.Drawing.Size(150, 28);
- this.txt_fStockOrgId.TabIndex = 217;
- //
// gv_fStockOrgId
//
this.gv_fStockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -587,15 +576,6 @@
this.lb_fSaleOrgId.Size = new System.Drawing.Size(73, 21);
this.lb_fSaleOrgId.TabIndex = 216;
this.lb_fSaleOrgId.Text = "閿�鍞粍缁� ";
- //
- // txt_fSaleOrgId
- //
- this.txt_fSaleOrgId.Location = new System.Drawing.Point(830, 20);
- this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
- this.txt_fSaleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fSaleOrgId.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
- this.txt_fSaleOrgId.TabIndex = 216;
//
// gv_fSaleOrgId
//
@@ -807,10 +787,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 426);
+ this.tabMx.Location = new System.Drawing.Point(0, 161);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 144);
+ this.tabMx.Size = new System.Drawing.Size(1126, 409);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -818,6 +798,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_fSaleOrgId);
+ this.panel1.Controls.Add(this.txt_fStockOrgId);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fApproverStaus);
@@ -839,9 +821,7 @@
this.panel1.Controls.Add(this.lb_fCreatorId);
this.panel1.Controls.Add(this.txt_fCreatorId);
this.panel1.Controls.Add(this.lb_fStockOrgId);
- this.panel1.Controls.Add(this.txt_fStockOrgId);
this.panel1.Controls.Add(this.lb_fSaleOrgId);
- this.panel1.Controls.Add(this.txt_fSaleOrgId);
this.panel1.Controls.Add(this.lb_fBillTypeID);
this.panel1.Controls.Add(this.txt_fBillTypeID);
this.panel1.Controls.Add(this.lb_billNo);
@@ -852,12 +832,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 426);
+ this.panel1.Size = new System.Drawing.Size(1126, 161);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(61, 388);
+ this.labelControl11.Location = new System.Drawing.Point(529, 126);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -867,7 +847,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 388);
+ this.lbGuid.Location = new System.Drawing.Point(580, 126);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -882,6 +862,22 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // txt_fStockOrgId
+ //
+ this.txt_fStockOrgId.IsReadly = false;
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(100, 52);
+ this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(130, 30);
+ this.txt_fStockOrgId.TabIndex = 248;
+ //
+ // txt_fSaleOrgId
+ //
+ this.txt_fSaleOrgId.IsReadly = false;
+ this.txt_fSaleOrgId.Location = new System.Drawing.Point(850, 20);
+ this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
+ this.txt_fSaleOrgId.Size = new System.Drawing.Size(130, 30);
+ this.txt_fSaleOrgId.TabIndex = 249;
//
// Frm_SalesDeliver
//
@@ -904,8 +900,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
@@ -984,11 +978,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fCreatorId;
private DevExpress.XtraEditors.LabelControl lb_fStockOrgId;
- private DevExpress.XtraEditors.TextEdit txt_fStockOrgId;
private DevExpress.XtraGrid.Columns.GridColumn gv_fStockOrgId;
private DevExpress.XtraEditors.LabelControl lb_fSaleOrgId;
- private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId;
private DevExpress.XtraEditors.LabelControl lb_fBillTypeID;
@@ -1003,5 +995,7 @@
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private System.Windows.Forms.PictureBox picCheckBox;
+ private UserControl.UcLookOrg txt_fSaleOrgId;
+ private UserControl.UcLookOrg txt_fStockOrgId;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 316e6ca..6576f6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -48,29 +48,52 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆鐢宠缁勭粐
- //this.txt_fapporgid.EditChanged += (s, e) =>
- //{
- // string _sqGuid = txt_fapporgid.GetId();
- // if (string.IsNullOrEmpty(_sqGuid))
- // return;
- // System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- // sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
- // var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- // var json = JsonConvert.SerializeObject(_obj);
- // try
- // {
- // var strReturn = UtilityHelper.HttpPost("",
- // "MesItemsManager/GetListSelect", json);
- // var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- // var dt = rtn.rtnData.list;
- // this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //};
+ //璁剧疆鍙戣揣缁勭粐
+ this.txt_fStockOrgId.EditChanged += (s, e) =>
+ {
+ string _sqGuid = txt_fStockOrgId.GetId();
+ if (string.IsNullOrEmpty(_sqGuid))
+ return;
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "MesItemsManager/GetListSelect", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ //this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ //璁剧疆閿�鍞粍缁�
+ this.txt_fSaleOrgId.EditChanged += (s, e) =>
+ {
+ string _sqGuid = txt_fStockOrgId.GetId();
+ if (string.IsNullOrEmpty(_sqGuid))
+ return;
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "MesItemsManager/GetListSelect", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ //this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
--
Gitblit v1.9.3