From fa8310bfd01c7f3123077d6d2f6a96a92645a034 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 四月 2026 08:43:30 +0800
Subject: [PATCH] 板材填了就减少库存   根据  板材规格    数量(张)和  发版套数  算出库存需要减少的量,减少库存  完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
index 085dd78..dc5a813 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
@@ -22,7 +22,8 @@
     {
         EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
-
+        public string therowspan = "";
+        public string tablesee = "";
         //鍒濆鍖�
         public AgMergerOrderDetail()
         {
@@ -115,7 +116,16 @@
             this.spanPMS_CompletionTime.InnerText = (m_EC_MergerSingle.PMS_CompletionTime ?? DateTime.Now).ToString("yyyy-MM-dd");
             this.spanPMS_TotalPrice.InnerText = (m_EC_MergerSingle.PMS_TotalPrice ?? 0).ToString("0.00");
             this.spanPMS_Remarks.InnerText = m_EC_MergerSingle.PMS_Remarks;
-             
+
+            if (string.IsNullOrEmpty(m_EC_MergerSingle.PMS_Remarks))
+            {
+                this.txtPSO_Remarks_o_TR1.Visible = false;
+            }
+            else
+            {
+                this.txtPSO_Remarks_o.InnerText = m_EC_MergerSingle.PMS_Remarks;
+            }
+
             if (m_EC_MergerSingle.Keyid != null)
             {
                 List<EC_MergerOrders> m_EC_MergerOrdersList = bll_EC_MergerSingleBLL.GetEC_MergerOrdersListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerOrders>;
@@ -169,6 +179,25 @@
                 }
                 this.Repeater1.DataSource = m_EC_MergerForumsList;
                 this.Repeater1.DataBind();
+
+                List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
+                this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
+                this.RepeaterHoudaoList.DataBind();
+
+                if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count <= 0)
+                {
+                    tablesee = "display:none;";
+                }
+              
+                if (m_EC_MergerHoudaosList != null)
+                {
+                    therowspan = (m_EC_MergerHoudaosList.Count + 1) + "";
+                   
+                }
+                else
+                {
+                    therowspan = "1";
+                }
             }
 
             return true;

--
Gitblit v1.9.1