From 91630884d699f90a8dec5348c2124468dc6f5324 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 06 十一月 2025 08:45:21 +0800
Subject: [PATCH] 很多修改

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 1fcaf36..31eb4b7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -98,7 +98,7 @@
                 _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
 
             }
-           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
+           var inquiryWorkBookModels  = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookSizeTxt).ThenBy(x=>x.WorkBookNameTxt);
           
             if (string.IsNullOrEmpty(biaotou))
             {
@@ -121,9 +121,16 @@
 
                 var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                 var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+                if((nums - LessNumber - Number) > 0)
+                {
+                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+                }
+                else
+                {
+                    biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
+                }
 
-
-                biaowei += " <td style=\"text-align:center\"> " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:red;\" >" + (nums - LessNumber - Number) + " </span></td>";
+               
 
             }
 
@@ -143,11 +150,19 @@
                         var Number = coreDeliverOrderItems1.Sum(x => x.Number);
                         var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
 
-                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number)  + " </span></td>";
+                        if(cmsPlanOrderItem.nums - LessNumber - Number > 0)
+                        {
+                            coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                        }
+                        else
+                        {
+                            coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                        }
+                       
                     }
                     else
                     {
-                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >0</span></td> ";
+                        coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >0</span></td> ";
                     }
                    
                 }

--
Gitblit v1.9.1