From 6cc71830bbeae7bfb25cf5fb24bc35728342a4da Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 27 八月 2025 14:09:01 +0800
Subject: [PATCH] 1、采购到货、到货条码、采购入库新增入库比例 2、合并审核按钮重置
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 94 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index b81bd11..38dc355 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -34,12 +35,15 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnHbClick += ToolBarMenu1_btnHbClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ }, tips, true, (strGuid) => {
+ getModelList(strGuid);
+ });
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -107,6 +111,18 @@
};
frm.ShowDialog();
};
+ ////搴曢儴姹囨�诲惎鐢�
+ // gvMx1.OptionsView.ShowFooter = true;
+
+ //// 涓烘煇涓�鍒楄缃眰鍜屾眹鎬�
+ // gvMx1.Columns["quantity"].SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum;
+ // gvMx1.Columns["quantity"].SummaryItem.DisplayFormat = "鍚堣: {0}";
+ /////搴曢儴姹囨��
+ UtilityHelper.SetupGridSummary(gvMx1, "quantity");
+ //鎵撳嵃姣斾緥
+ UtilityHelper.SetSimpleGridColor(gridView1, "barcodeProgress", "=100.00%", "Cell", Color.Green);
+ //鍏ュ簱姣斾緥
+ UtilityHelper.SetSimpleGridColor(gridView1, "rkbl", "=100.00%", "Cell", Color.Green);
}
@@ -174,6 +190,11 @@
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
_toolCk("EditModelSubmitF");
+ }
+
+ private void ToolBarMenu1_btnHbClick(object sender, EventArgs e)
+ {
+ _toolCk("EditModelSubmitHb");
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -292,6 +313,9 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
}
/// <summary>
@@ -372,6 +396,13 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
toolBarMenu1.currentAction = "";
+ // 銆愭柊澧炲埛鏂伴�昏緫銆戜繚瀛樻垚鍔熷悗绔嬪嵆鍒锋柊褰撳墠妯″瀷鏁版嵁鍜屽垪琛�
+ // 鍒锋柊褰撳墠鍗曟嵁璇︽儏
+ getModel(lbGuid.Text.Trim());
+ // 鍒锋柊鍒楄〃椤垫暟鎹�
+ getPageList(this.pageBar1.CurrentPage);
+
+ // 璺宠浆鍒版煡鐪嬬粨鏋滈〉闈�
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
@@ -600,22 +631,26 @@
_webServiceName + _meth,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
+ //鍒ゆ柇瀹℃牳鍚庢槸鍚﹀彉涓虹孩绔狅紙1锛氱孩绔犲凡瀹℃牳 锛�-1 榛戠珷鏈鏍革級
+ int _inFieldValue = ((_meth == "EditModelSubmit" || _meth == "EditModelSubmitHb") ? 1 : -1);
UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -634,5 +669,56 @@
HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid);
frm.ShowDialog();
}
+
+ /// <summary>
+ /// 鏂板鏂规硶锛氬垪琛ㄦ樉绀�
+ /// </summary>
+ /// <param name="strGuid">涓昏〃id</param>
+
+ private void getModelList(string strGuid)
+ {
+ gcMxL1.DataSource = null;
+
+
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+
+ JArray array1 = new JArray();
+ foreach (var a in dy["list"])
+ {
+ array1.Add(a);
+ }
+ DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ if (dt1.Rows.Count > 0)
+ {
+ gcMxL1.BindingContext = new BindingContext();
+ gcMxL1.DataSource = dt1;
+ gcMxL1.ForceInitialize();
+ gvMxL1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL1);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL1, gvMxL1);
+ }
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3