From 25901fce975c288864cc2bcff7f4156463fbf2f8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 04 十一月 2024 18:35:17 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 55cbb39..c85eaf1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -2,12 +2,12 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
-using System.Security.Cryptography;
using System.Text;
using System.Windows.Forms;
using DevExpress.DataAccess.DataFederation;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -22,7 +22,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesInvItemArnManager/";
-
public Frm_MesInvItemArn()
{
InitializeComponent();
@@ -39,6 +38,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -56,9 +56,16 @@
};
this.txt_depotsCode.KeyFile = "depotCode";
this.txt_suppNo.KeyFile = "suppNo";
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- var frm = new SelectCgMx();
+ if (string.IsNullOrEmpty(this.txt_suppNo.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ return;
+ }
+ System.Text.StringBuilder sbWhere = new StringBuilder();
+ var frm = new SelectCgMx(this.txt_suppNo.GetCode(), sbWhere.ToString());
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<string>();
@@ -83,9 +90,13 @@
};
}
- private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
- throw new NotImplementedException();
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -270,13 +281,6 @@
toolBarMenu1.isSetBtn = false;
var _ckCode = txt_depotsCode.GetCode(); //浠撳簱缂栧彿 depots_code
var _gysCode = txt_suppNo.GetCode(); //渚涘簲鍟嗙紪鍙�
- if (string.IsNullOrEmpty(_ckCode))
- {
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotsCode.Focus();
- return;
- }
-
if (string.IsNullOrEmpty(_gysCode))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
@@ -284,17 +288,16 @@
return;
}
- if (string.IsNullOrEmpty(txt_paperBillNo.Text.Trim()))
+ if (string.IsNullOrEmpty(_ckCode))
{
- MsgHelper.Warning("璇烽�夋嫨閫佽揣鍗曞彿锛�");
- txt_paperBillNo.Focus();
+ MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_depotsCode.Focus();
return;
}
-
var _obj = new MesInvItemArn();
_obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //鍒拌揣鍗曚富閿�
_obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //閫佽揣鍗曞彿;
- _obj.Remark = ""; //澶囨敞
+ _obj.Remark = txt_remark.Text.Trim(); //澶囨敞
_obj.SuppNo = _gysCode; //渚涘簲鍟嗙紪鍙�
_obj.DepotsCode = _ckCode; //浠撳簱缂栧彿 depots_code
_obj.FType = txt_fType.Checked; //0=閲囪喘锛�1=濮斿
@@ -452,6 +455,11 @@
var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
var strJson = "";
var lst = new List<string>();
lst.Add(mxGuid);
--
Gitblit v1.9.3