From 8ca897a6dba811d642065db2c8eb1f00ac6e561c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 20 十月 2025 13:58:24 +0800
Subject: [PATCH] caa解锁
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 167 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 8328e66..5020849 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraCharts.GLGraphics.Platform;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -21,6 +22,7 @@
string _ucBm = "";//棰嗘枡閮ㄩ棬
string _ucHzlx = "";//璐т富绫诲瀷
string _ucHz = "";//璐т富
+ string _ucGys = "";//渚涘簲鍟�
public Frm_MesItemQt()
{
InitializeComponent();
@@ -64,22 +66,8 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
- 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
- {
- var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
+ ucLookHuoZhu1.SetHzId(_ucHz);
+ _bindLookSearch(txt_qt035.Text.Trim(), "","");
};
//閫夋嫨棰嗙敤缁勭粐
txt_qt024.EditChanged += (s, e) =>
@@ -89,22 +77,62 @@
return;
txt_qt013.getSuppler(_orgId, _ucKh);
txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_wwgys.getSuppler(_orgId, _ucGys);
};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
{
- string strSrmNo = "";
- SelectDaa frm = new SelectDaa();
+ string _orgId = txt_qt023.GetId();
+ SelectDaa frm = new SelectDaa(_orgId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
- strSrmNo = lst[0].guid;
+ string strSrmNo = lst[0].guid;
+ string strGdlx = lst[0].gdlx;
+ string strGdlxWlid = lst[0].gdlxWlid;
txt_qt035.Text = strSrmNo;
+ _bindLookSearch(txt_qt035.Text.Trim(), strGdlx, strGdlxWlid);
+ #region 閫夋嫨宸ュ崟鍚庡甫鍑轰笅闈㈢殑鐗╂枡 2025-09-27
+ //try
+ //{
+ // var _obj = new
+ // {
+ // strDaaNo = strSrmNo,//涓诲缓
+ // };
+ // var strReturn = UtilityHelper.HttpPost("",
+ // "WomdaaManager/SelectDaaMx",
+ // JsonConvert.SerializeObject(_obj));
+ // var dt = UtilityHelper.ReturnToList(strReturn);
+ // DataTable _newTable = dt.rtnData;
+ // DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ // foreach (DataRow dddddd in _newTable.Rows)
+ // {
+ // DataRow _row = _oldTable.NewRow();
+ // _row["qd002"] = dddddd["itemNo"].ToString();
+ // _row["qd003"] = dddddd["itemName"].ToString();
+ // _row["qd004"] = dddddd["itemModel"].ToString();
+ // _row["qd009dw"] = dddddd["dwName"].ToString();
+ // _row["itemId"] = dddddd["itemId"].ToString();
+ // _row["depotName"] = dddddd["depotName"].ToString();
+ // _row["depotId"] = dddddd["depotId"].ToString();
+ // _row["kcQty"] = dddddd["kcQty"].ToString();
+ // _oldTable.Rows.Add(_row);
+ // }
+ // gcMx1.BindingContext = new BindingContext();
+ // gcMx1.DataSource = _oldTable;
+ // gcMx1.ForceInitialize();
+ // gvMx1.BestFitColumns();
+ // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show(ex.Message);
+ //}
+ #endregion
};
frm.ShowDialog();
};
-
#region 2025-08-27 澶嶅埗beg
btnCopyXls.Click += (s, e) =>
{
@@ -162,6 +190,76 @@
}
};
#endregion
+
+ #region 2025-08-27 澧炲姞濮斿渚涘簲鍟�
+ txt_qtlx.SelectedIndexChanged += (s, e) =>
+ {
+ int idx = txt_qtlx.SelectedIndex;
+ if (idx == 7)
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ }
+ else
+ {
+ layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ txt_wwgys.SetIdOrCode("");
+ }
+ };
+ #endregion
+ }
+
+ /// <summary>
+ /// 鏉ユ簮鏄庣粏闄愬埗锛�
+ /// </summary>
+ /// <param name="strGdlx">宸ュ崟绫诲瀷锛屽鏋滄槸缁翠慨锛屾牴鎹墿鏂欐壘</param>
+ private void _bindLookSearch(string daaNo, string strGdlx,string gdlxWlid)
+ {
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + txt_qt023.GetId() + "'");
+ if (daaNo.Trim().Length > 0)
+ {
+ if (strGdlx == "W-缁翠慨杩斿伐" || strGdlx == "C-鎷嗘満杩斿伐")
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAA daa left join WOMDAB dab on daa.guid=dab.daaGuid ");
+ sbWhere.Append(" where daa.guid=( select top 1 ddddd.guid as dddddGuid from WOMDAA ddddd where ddddd.daa002='"+ gdlxWlid + "' and ddddd.daa025 in('F-閲忎骇','S-璇曚骇') order by ddddd.daa001 desc )");
+ sbWhere.Append(" )");
+ }
+ else {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAB dab where dab.dab001 = '" + txt_qt035.Text.Trim() + "'");
+ sbWhere.Append(" )");
+ }
+ }
+ 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);
+ DataTable dt = rtn.rtnData.list;
+ //濡傛灉娌℃湁锛屽啀璇讳竴閬�
+ if (dt == null || dt.Rows.Count <= 1)
+ {
+ _bindLookSearch("","", "");
+ }
+ else
+ {
+ this.gridView2.IndicatorWidth = 60;
+ this.gridView2.CustomDrawRowIndicator += (ss, ee) =>
+ {
+ if (ee.Info.IsRowIndicator && ee.RowHandle >= 0)
+ ee.Info.DisplayText = (ee.RowHandle + 1).ToString();
+ };
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -361,6 +459,7 @@
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
string qtlx = txt_qtlx.Text.Trim();//鍚庢潵澧炲姞鐨勭被鍨�
+ string wwgys = txt_wwgys.GetId();
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -389,10 +488,33 @@
txt_qtlx.Focus();
return;
}
- if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ //杩欐槸闈炲澶栫殑闃插憜
+ if (txt_qtlx.SelectedIndex != 7)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
- return;
+ if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓嶄负銆�7:鏃犳簮鍗曞澶栭��鏂欍��,璇蜂笉瑕侀�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ }
+ //杩欐槸濮斿鐨勯槻鍛�
+ if (txt_qtlx.SelectedIndex == 7)
+ {
+ if (string.IsNullOrEmpty(wwgys))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,璇烽�夋嫨濮斿渚涘簲鍟嗭紒");
+ return;
+ }
+ if (!string.IsNullOrEmpty(inLyCus))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍑哄簱绫诲瀷涓恒��7:鏃犳簮鍗曞澶栭��鏂欍��,涓嶇敤閫夋嫨瀹㈡埛锛�");
+ return;
+ }
}
var _obj = new
{
@@ -407,7 +529,8 @@
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
inSource = txt_qt035.EditValue,//宸ュ崟鍙�
- qtlx=qtlx,
+ qtlx = qtlx,
+ wwgys = wwgys,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -499,7 +622,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -549,6 +673,11 @@
_ucBm = dy.qt009;
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
+ _ucGys = dy.wwgys;//濮斿渚涘簲鍟�
+ // ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -557,6 +686,7 @@
_ucBm = "";
_ucHzlx = "";
_ucHz = "";
+ _ucGys = "";
ucLookHuoZhu1.Enabled = isEdit;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -767,7 +897,7 @@
gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
-
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
@@ -830,20 +960,29 @@
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
return;
+
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ if (string.IsNullOrEmpty(strItemId))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨鐗╂枡锛�");
+ return;
+ }
var strOrgGuid = txt_qt023.GetId();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨搴撳瓨缁勭粐锛�");
return;
}
- ;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
--
Gitblit v1.9.3