From 3f11ff9548d3255da309ecc4ed301c8c4a1cb204 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Thu, 12 Feb 2026 21:44:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(CLGL):=20=E5=85=A5=E5=BA=93=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86=E5=AE=9E?=
 =?UTF-8?q?=E6=94=B6=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/CLGL/TwInputmasterService.cs         |  2 +-
 SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx |  2 +-
 .../CLGL/InPlanMasterEdit.aspx.cs             | 35 +++++++++++++++++--
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/SGGL/BLL/CLGL/TwInputmasterService.cs b/SGGL/BLL/CLGL/TwInputmasterService.cs
index 7f2d06eb..261f6d61 100644
--- a/SGGL/BLL/CLGL/TwInputmasterService.cs
+++ b/SGGL/BLL/CLGL/TwInputmasterService.cs
@@ -241,7 +241,7 @@ namespace BLL
             if (plan == null || plan.State != (int)TwConst.State.已审核)
             {
                 return;
-            }
+            }             
             //判断是否已经生成过入库单
             var queryIsExitInMaster = new Tw_InOutMasterOutput();
             queryIsExitInMaster.InOutPlanMasterId = planId;
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
index bde8c373..5959a00d 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx
@@ -22,7 +22,7 @@
                 <Toolbars>
                     <f:Toolbar ID="TbCreate" Position="Top" ToolbarAlign="Right" runat="server" >
                         <Items>
-                            <f:Button ID="btnSave" ToolTip="入库" Text="入库" Icon="SystemSave" OnClick="btnSave_Click"
+                            <f:Button ID="btnSave" ToolTip="保存" Text="保存" Icon="SystemSave" OnClick="btnSave_Click"
                                 EnablePostBack="true" runat="server">
                             </f:Button>
                             <%--<f:Button ID="btnEditProcess" ToolTip="编辑流程" Text="编辑流程" Icon="ApplicationEdit" OnClick="btnEditProcess_Click"
diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
index 3dc65322..eea0d104 100644
--- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx.cs
@@ -43,8 +43,10 @@ namespace FineUIPro.Web.CLGL
                     var detailList = TwInOutplandetailService.GetByModle(queryModel).ToList();
                     foreach (var item in detailList)
                     {
-                        item.ActNum = item.PlanNum;
-
+                        if (!item.ActNum.HasValue)
+                        {
+                            item.ActNum = item.PlanNum;
+                        } 
                     }
                     Grid1.DataSource = detailList;
                     Grid1.DataBind();
@@ -79,6 +81,26 @@ namespace FineUIPro.Web.CLGL
             }
             return detailLists;
         }
+        /// <summary>
+        ///  保存计划明细项的实收数量
+        /// </summary>
+        private void SavePlanDetail(string InOutPlanMasterId)
+        {
+            JArray teamGroupData = Grid1.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                string detailId = teamGroupRow.Value<string>("id");
+                decimal actNum = values.Value<decimal>("ActNum");
+
+                var detail = TwInOutplandetailService.GetById(detailId);
+                if (detail != null)
+                {
+                    detail.ActNum = actNum;
+                    TwInOutplandetailService.Update(detail);
+                }
+            }
+        }
         protected void btnEditProcess_Click(object sender, EventArgs e)
         {
             throw new NotImplementedException();
@@ -87,7 +109,14 @@ namespace FineUIPro.Web.CLGL
         protected void btnSave_Click(object sender, EventArgs e)
         {
             var model = TwInOutplanmasterService.GetById(Id);
-            if (model == null) return;
+            if (model == null) return; 
+            if (model.State == (int)TwConst.State.待审核)
+            {
+                SavePlanDetail(Id);
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                return;
+            }
             model.WarehouseMan = this.CurrUser.PersonId;
             model.WarehouseDate = DateTime.Now;
             TwInOutplanmasterService.Update(model);