From e2fffcde27c802e06b4e15ea100c1df838b6ea52 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 06 十二月 2025 10:42:27 +0800
Subject: [PATCH] 委外加工出库增加仓库库存

---
 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index 7fddb4d..006a55b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -15,6 +15,7 @@
         string _webServiceName = "WWBlManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public string strType = "";
+        string _ucGys = "";//渚涘簲鍟�
         public WwBlcl(string _strType)
         {
             InitializeComponent();
@@ -36,8 +37,10 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
             this.toolBarMenu1.getXmlConfig();
-            Form parentForm = this.FindForm();
+            Form parentForm = this.FindForm(); 
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
             {
@@ -52,10 +55,23 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
+            txt_orgId.EditChanged += (s, e) =>
+            {
+                var orgId = txt_orgId.GetId();
+                if (string.IsNullOrEmpty(orgId))
+                    return;
+                txt_wwGys.getSuppler(orgId, _ucGys);
+            };
             //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
             {
-                var frm = new UcWwBlclSelectAll();
+                if (string.IsNullOrEmpty(txt_wwGys.GetId()))
+                {
+                    MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
+                    txt_wwGys.Focus();
+                    return;
+                }
+                var frm = new UcWwBlclSelectAll(txt_orgId.GetId(), txt_wwGys.GetId());
                 //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -71,9 +87,11 @@
                             _row["bld003"] = dym.itemName;//鐗╂枡鍚嶇О
                             _row["bld004"] = dym.itemModel;//瑙勬牸鍨嬪彿
                             _row["dabGuid"] = dym.dabGuid;
+                            _row["xlsl"] = dym.dab006;
                             _row["bld008"] = dym.dab007;//宸查鐢ㄩ噺
                             _row["bld009"] = dym.dwName;//鍗曚綅
                             _row["bld001"] = dym.bld001;//宸ュ崟鍙�
+                            _row["stockNum"] = dym.stockNum;//搴撳瓨鏁伴噺
                             _Table.Rows.Add(_row);
                             idx++;
                         }
@@ -93,6 +111,8 @@
                 frm.ShowDialog();
             };
         }
+
+       
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -255,6 +275,9 @@
                 gvList.Add(gvMx1);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
+            //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+            txt_orgId.IsReadly = true;
+            txt_wwGys.IsReadly = true;
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -269,6 +292,8 @@
             gridViews.Add(gvMx1);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId);
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -284,11 +309,25 @@
                 txt_bl017.Focus();
                 return;
             }
+            if (string.IsNullOrEmpty(txt_orgId.GetId()))
+            {
+                MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�");
+                txt_orgId.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(txt_wwGys.GetId()))
+            {
+                MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
+                txt_wwGys.Focus();
+                return;
+            }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 inYy = txt_bl007.Text.Trim(),//鍘熷洜
                 inType = txt_bl017.Text.Trim(),//鍑哄簱绫诲埆
+                inOrgId = txt_orgId.GetId(),
+                inWwGys = txt_wwGys.GetId(),
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -415,10 +454,12 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    _ucGys = dy.wwGys;
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    _ucGys = "";
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -447,6 +488,16 @@
             }
         }
 
+        /// <summary>
+        /// 瀹岀粨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+        {
+            _toolCk(2);
+        }
 
         /// <summary>
         ///     瀹℃牳浜嬩欢
@@ -483,6 +534,9 @@
                     break;
                 case 0:
                     strMsg = "鍙嶅鏍�";
+                    break;
+                case 2:
+                    strMsg = "瀹岀粨";
                     break;
             }
             ;
@@ -570,5 +624,27 @@
                 }
             }
         }
+
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_blNo, gridView1, "blNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_WWBL{"
+                                               + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3