From 3d429071ceeda5ce75ca660c13459c13f3d92337 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 二月 2025 10:30:11 +0800
Subject: [PATCH] 调拨

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index a19206e..11979a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -131,7 +131,7 @@
         {
             string rowGuid = "", rowName = "";
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1, "fBillNo");
+                lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -239,9 +239,16 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-             string djlx = txt_fBillTypeID.Text.ToString();
-             string FNote = txt_fNote.Text.ToString();
+            string djlx = txt_fBillTypeID.Text.ToString();
+            string FNote = txt_fNote.Text.ToString();
             string _sqGuid = txt_salesId.GetId();
+            string _fhOrg = txt_fStockOrgId.GetId();
+            if (string.IsNullOrEmpty(_fhOrg))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戣揣缁勭粐锛�");
+                txt_fStockOrgId.Focus();
+                return;
+            }
             if (txt_fBillTypeID.SelectedIndex < 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -260,6 +267,7 @@
                 djlx = djlx,//鍗曟嵁绫诲瀷
                 salesId = _sqGuid,//閿�鍞崟鍙�
                 inRemark = FNote.Trim(),//澶囨敞
+                fhOrg = _fhOrg,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -460,7 +468,7 @@
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "fBillNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -488,7 +496,7 @@
                     }
                     int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                     gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
@@ -551,6 +559,6 @@
             }
         }
 
-       
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3