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 |  134 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
index b580604..a3ada61 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -121,9 +121,9 @@
                 <th style="text-align: center; width: 56px;">
                     淇垏瑕佹眰
                 </th>
-                <th style="text-align: center; width: 56px;">
+                <%--<th style="text-align: center; width: 56px;">
                     鍖呰瑕佹眰
-                </th>
+                </th>--%>
                 <th style="text-align: center;">
                     鍚庨亾鍙婂伐鑹鸿姹�
                 </th>
@@ -148,9 +148,9 @@
                         <td style="text-align: center;">
                             <%#Eval("PO_TrimRequire")%>
                         </td>
-                        <td style="text-align: center;">
+                       <%-- <td style="text-align: center;">
                             <%#Eval("PO_PackagRequire")%>
-                        </td>
+                        </td>--%>
                         <td>
                             <div style="width: 254px; overflow: visible; word-break: break-all; word-wrap: normal; text-align: left;">
                                 <%#Eval("PO_RequirementWork").ToString().Replace("锛�+-+锛�", ",")%>
@@ -287,6 +287,7 @@
                 </tr>
             </tbody>
         </table>
+        
          <asp:Repeater ID="Repeater1" runat="server">
                         <ItemTemplate>
                             <table cellpadding="0" cellspacing="0" style="text-align: center;">
@@ -299,35 +300,48 @@
                                     <td rowspan="2">
                                          鏋勪欢 
                                     </td>
-                                    <td rowspan="2" colspan="2">
-                                        P鏁� 
+                                    <td rowspan="2" >
+                                        椤垫暟 
                                     </td>
-                                    <td rowspan="2" colspan="2">
+                                    <td rowspan="2" >
                                         鍗板埛鏈哄彴
                                     </td>
-                                    <td colspan="2">
-                                        <span  style="<%#Eval("shifouxianshi")%>" >鍗拌壊</span>   
+                                    <td colspan="3">
+                                        <span  style="<%#Eval("shifouxianshi")%>" >鍗板埛瑕佹眰</span>   
                                     </td>
-                                    <td rowspan="2" colspan="2">
+                                   <%-- <td rowspan="2" colspan="2">
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>    
+                                    </td>--%>
+                                     <td rowspan="2" >
+                                     <span  style="<%#Eval("shifouxianshi")%>" >  鏉挎潗瑙勬牸</span>   
+                                    </td>
+                                     <td rowspan="2" >
+                                     <span  style="<%#Eval("shifouxianshi")%>" > 鏁伴噺锛堝紶锛� </span>   
+                                    </td>
+                                     <td rowspan="2" >
+                                        鍙戠増濂楁暟
                                     </td>
                                 </tr>
                                 <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
+                                     
                                     <td>
-                                        <span  style="<%#Eval("shifouxianshi")%>" >姝�</span>    
+                                        <span  style="<%#Eval("shifouxianshi")%>" >姝i潰鑹叉暟</span>    
                                     </td>
                                     <td>
-                                        <span  style="<%#Eval("shifouxianshi")%>" >鑳�</span>  
+                                        <span  style="<%#Eval("shifouxianshi")%>" >鑳岄潰鑹叉暟</span>  
+                                    </td>
+                                    <td>
+                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>  
                                     </td>
                                 </tr>
                                 <tr style="background-color: #FFFFFF;">
                                     <td>
                                         <%#Eval("PSF_Component")%>
                                     </td>
-                                    <td colspan="2">
+                                    <td >
                                         <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
                                     </td>
-                                    <td colspan="2">
+                                    <td >
                                         <%#Eval("PSF_PressesDesk")%>
                                     </td>
                                     <td>
@@ -336,7 +350,7 @@
                                     <td>
                                      <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
                                     </td>
-                                    <td colspan="2">
+                                    <td >
                                      <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>       
                                     </td>
                                     <%--<td>
@@ -348,6 +362,15 @@
                                     <td>
                                         <%#Eval("PSF_EditionCount")%>
                                     </td>--%>
+                                    <td>
+                                         <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
+                                    </td>
+                                    <td>
+                                        <span  style="<%#Eval("shifouxianshi")%>" >   <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
+                                    </td>
+                                    <td>
+                                        <%#Eval("PSF_Fabantaoshu")%>
+                                    </td>
                                 </tr>
                                 <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>" >
                                     <td rowspan="2">
@@ -363,7 +386,7 @@
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >绾稿紶鏁伴噺锛堝紶锛�</span>       
                                     </td>
                                     <td colspan="4">
-                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏂欒鏍�</span>       
+                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏂欒鏍硷紙mm锛�</span>       
                                     </td>
                                 </tr>
                                 <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
@@ -380,10 +403,10 @@
                                          <span  style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏁�</span>      
                                     </td>
                                     <td>
-                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >瀹藉害(mm)</span>       
+                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >瀹藉害</span>       
                                     </td>
                                     <td>
-                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >闀垮害(mm)</span>      
+                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >闀垮害</span>      
                                     </td>
                                 </tr>
                                 <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
@@ -418,7 +441,7 @@
                                         <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
                                     </td>
                                 </tr>
-                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
+                              <%--  <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                                     <td>
                                         <span  style="<%#Eval("shifouxianshi")%>" >鐗堟潗绫诲瀷</span>
                                     </td>
@@ -436,7 +459,7 @@
                                     </td>
                                     <td colspan="6">
                                     </td>
-                                    <tr>
+                                    </tr>
                                         <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
                                             <td>
                                                <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
@@ -455,7 +478,7 @@
                                             </td>
                                             <td colspan="6">
                                             </td>
-                                        </tr>
+                                        </tr>--%>
                                         <tr style="<%#Eval("shifouqitadingdan")%>">
                                             <td style="font-weight: bold; background-color: #E6E6E6;">
                                                 鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
@@ -464,9 +487,9 @@
                                                 <%#Eval("PSF_PaperName")%>
                                             </td>
                                         </tr>
-                                        <tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
+                                        <tr style=" display:none;">
                                             <td style="font-weight: bold; background-color: #E6E6E6;">
-                                                娉ㄦ剰浜嬮」锛�
+                                                鐢熶骇瑕佹眰锛�
                                             </td>
                                             <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
                                                 <%#Eval("PSF_Note")%>
@@ -475,6 +498,71 @@
                             </table>
                         </ItemTemplate>
                     </asp:Repeater>
+ 
+
+               <table  cellpadding="0" cellspacing="0" style="text-align: left;width: 100%;<%=tablesee%>">
+                       
+                        <tbody>
+                             
+                            <tr> 
+                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;" rowspan="<%=therowspan %>">
+                                                鍚庨亾宸ュ簭锛�
+                                            </td>
+                               
+                               
+                                          <asp:Repeater ID="RepeaterHoudaoList" runat="server">
+                    <ItemTemplate>
+                                        
+                                             <td>
+                      
+                            <%#Eval("PSF_Houdaogongxu")%>
+                        
+                    </td>
+
+                                              <td>
+                        鏁伴噺: <%#Eval("PSF_Shuliang")%>
+                    </td>
+                                             <td>
+                        鍊嶆暟: <%#Eval("PSF_Beishu")%>
+                    </td>
+       <td>
+                        鏈洪暱:<%#Eval("PSF_Jichang")%>
+                    </td>
+                                              <td>
+                        
+                       瑕佹眰: <%#Eval("PSF_Yaoqiu")%>
+                         
+                    </td>
+                          </tr>                       
+                          </ItemTemplate>
+                </asp:Repeater>
+                                      
+                           
+                          
+                        </tbody>
+                    </table>
+        
+             
+             
+           
+                    <table cellpadding="0" cellspacing="0" style="text-align: left;" id="txtPSO_Remarks_o_TR1" runat="server" >
+                      <%--  <tr style="border: none; background-color: #E4E4E4;">
+                            <th colspan="1" style="text-align: left; text-indent: 5px;">
+                                <b>澶囨敞</b>
+                            </th>
+                        </tr>--%>
+                        <tbody>
+                            <tr>
+                                <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
+                                                鐢熶骇瑕佹眰锛�
+                                            </td>
+                                <td>
+                                    <span runat="server" id="txtPSO_Remarks_o"></span>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                 
     </div>
     </form>
 </body>

--
Gitblit v1.9.1