From be94e54dc7cd0eb2e66f25d7def9a873c563564c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 10 一月 2025 09:53:30 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs |  151 +++++++++++++++++++++++++-------------------------
 1 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 699ef10..f7c464e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -20,8 +20,6 @@
             InitializeComponent();
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
-            toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
@@ -37,19 +35,42 @@
             });
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            txt_depotsId.getSuppler("");
-            txt_suppId.getSuppler("");
-            //璁剧疆浠撳簱閫夋嫨
-            this.txt_depotsId.EditChanged += (s, e) =>
+            this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
-                txtDepotsId.Text = this.txt_depotsId.GetId();
+                ucBtnPrint1.rptParameter = "rpt_Arrival{}";
             };
-            //璁剧疆渚涘簲鍟嗛�夋嫨
-            this.txt_suppId.EditChanged += (s, e) =>
+            this.ucBtnPrint1.btnReportClick += (s, e) =>
             {
-                txtSupplierId.Text = this.txt_suppId.GetId();
+                string rowGuid = lbMxGuid.Text.Trim();
+                ucBtnPrint1.guidKey = rowGuid;
+                if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
+                    txt_iCount_1.Focus();
+                    this.ucBtnPrint1.rptParameter = "return false";
+                    return;
+                }
+                if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
+                    txt_psnQty_1.Focus();
+                    this.ucBtnPrint1.rptParameter = "return false";
+                    return;
+                }
+                if (lbMxGuid.Text.Trim().Length < 10)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+                    this.ucBtnPrint1.rptParameter = "return false";
+                    return;
+                }
+                this.ucBtnPrint1.rptParameter = "rpt_Arrival{" + lbMxGuid.Text.Trim()
+                       + "," + ""
+                       + "," + ""
+                       + "," + txt_iCount_1.Text.Trim()
+                       + "," + txt_psnQty_1.Text.Trim()
+                       + "}";
             };
-            gcMx1.MouseClick += GcMx1_MouseClick;
+            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -57,23 +78,20 @@
             Task.Delay(100);
             getPageList(1);
         }
-        private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
         {
-            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
-            if (string.IsNullOrEmpty(rowGuid))
-                return;
-            lbMxGuid.Text = rowGuid;
-            toolBarMenu1.guidKey = rowGuid;
-            var info = gvMx1.CalcHitInfo(e.Location);
-            var view = info.View;
-            var row = view.GetDataRow(info.RowHandle);
-            txtWlid.Text = row["itemId"].ToString();
-            txtWlgg.Text = row["itemModel"].ToString();
-            txtWlmc.Text = row["itemName"].ToString();
-            txtQuantity.Text = row["Quantity"].ToString();
-            kyPrtQty.Text = row["kyPrtQty"].ToString();
+            if (e.FocusedRowHandle >= 0)
+            {
+                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+                lbMxGuid.Text = row["guid"].ToString();
+                txtWlid.Text = row["itemNo"].ToString();
+                txtWlgg.Text = row["itemModel"].ToString();
+                txtWlmc.Text = row["itemName"].ToString();
+                txtQuantity.Text = row["quantity"].ToString();//鏈鏀惰揣鎬婚噺
+                txtYdy.Text = row["yQty"].ToString();//宸叉墦鍗版�婚噺
+                txtKdy.Text = row["kQty"].ToString(); //鍙墦鍗版�婚噺
+            }
         }
-
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -106,19 +124,6 @@
         {
             _filterList = e.FilterList;
             getPageList(1);
-        }
-        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-            toolBarMenu1.rptParameter = "rpt_Arrival{}";
-        }
-        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
-        {
-            _print();
         }
 
         /// <summary>
@@ -187,6 +192,7 @@
         }
         private void getModel(string strGuid)
         {
+            gcMx1.DataSource = null;
             bool isEdit = false;
             if (toolBarMenu1.currentAction == "add") return;
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -216,6 +222,7 @@
                     {
                         array1.Add(a);
                     }
+                   
                     DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                     if (dt1.Rows.Count > 0)
                     {
@@ -252,46 +259,40 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-        private void _print()
+
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-            if (xtraTabControl1.SelectedTabPageIndex == 0)
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 5);
-                this.toolBarMenu1.rptParameter = "return false";
+            var rowhandle = gvMx2.FocusedRowHandle;
+            if (rowhandle < 0)
                 return;
-            }
-            if (lbMxGuid.Text.Trim().Length < 36)
+            if (e.Button.Index == 0)
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
-                this.toolBarMenu1.rptParameter = "return false";
-                return;
+                var dr = gvMx2.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                var _obj = new
+                {
+                    mxGuid = mxGuid,
+                    inType="dhtm"
+                };
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "DeleteBarcode",
+                        JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                    }
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
             }
-            if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
-                txt_iCount_1.Focus();
-                this.toolBarMenu1.rptParameter = "return false";
-                return;
-            }
-            if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                txt_psnQty_1.Focus();
-                this.toolBarMenu1.rptParameter = "return false";
-                return;
-            }
-            toolBarMenu1.guidKey = lbMxGuid.Text;
-            this.toolBarMenu1.rptParameter = "rpt_Arrival{" + ""
-                   + "," + ""
-                   + "," + ""
-                   + "," + txt_iCount_1.Text.Trim()
-                   + "," + txt_psnQty_1.Text.Trim()
-                   + "}";
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3