From f0c21ec9c1e9c7cd5db58caeb760c7d7ca6df002 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 16 十二月 2025 08:47:56 +0800
Subject: [PATCH] 公文管理中,“主题词”和“抄送”的字体改为粗宋  完成

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index 5cb53b7..7a4ad04 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -41,7 +41,7 @@
             {
                  
 
-                BindList("diyici");
+                BindList();
             }
              
         }
@@ -102,7 +102,7 @@
           
             if (string.IsNullOrEmpty(biaotou))
             {
-                string biaotou2 = " <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
+                string biaotou2 = "<th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th> <th style=\"text-align:center\" >  </th>";
                 foreach (var inquiryWorkBookModel  in inquiryWorkBookModels)
                 {
                     biaotou += " <th style=\"text-align:center\" colspan=\"2\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
@@ -136,11 +136,19 @@
                         {
                             if (cmsPlanOrderItem.nums - LessNumber - Number > 0)
                             {
-                                biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                                if (LessNumber + Number > 0)
+                                {
+                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:pink;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                                }
+                                else
+                                {
+                                    biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                                }
+
                             }
                             else
                             {
-                                biaoge += " <td style=\"text-align:center\"> " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
+                                biaoge += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td> <td style=\"text-align:center\"> <span style=\"color:green;\" >" + (cmsPlanOrderItem.nums - LessNumber - Number) + " </span></td>";
                             }
                         }
                         else
@@ -241,6 +249,29 @@
                             }
                         }
                     }
+                    else if (OrderState == "4")
+                    {
+                        var jihuashuliang = cmsPlanOrderItems1.Sum(x => x.nums);
+                        var coreDeliverOrderItems2 = coreDeliverOrderItems.Where(x => x.PlanOrderId == coreCmsPlanOrder.id);
+                        var songhuoshuliang = coreDeliverOrderItems2.Sum(x => x.Number);
+                        var jieyueshuliang = coreDeliverOrderItems2.Sum(x => x.LessNumber);
+                        if (songhuoshuliang <= 0 && jieyueshuliang <= 0)
+                        {
+                            coreCmsPlanOrder.biaoge += biaoge;
+                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+                            {
+                                PlanOrderid.Add(coreCmsPlanOrder.id);
+                            }
+                        }
+                        else if (songhuoshuliang + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
+                        {
+                            coreCmsPlanOrder.biaoge += biaoge;
+                            if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+                            {
+                                PlanOrderid.Add(coreCmsPlanOrder.id);
+                            }
+                        }
+                    }
 
 
                 }
@@ -249,7 +280,7 @@
 
 
 
-            biaowei = "   <td style=\"text-align:center\"> "+ PlanOrderid.Count +" </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
+            biaowei = "  <td></td>  <td style=\"color: grey;text-align: center;\" > " + PlanOrderid.Count +" </td><td style=\"text-align:center\">  </td> <td style=\"text-align:center\">  </td> ";
             foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
             {
                 var nums = cmsPlanOrderItems.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.orderId)).Sum(x => x.nums);
@@ -260,11 +291,19 @@
                 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>";
+                    if(LessNumber + Number > 0)
+                    {
+                        biaowei += " <td style=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:pink;\" >" + (nums - LessNumber - Number) + " </span></td>";
+                    }
+                    else
+                    {
+                        biaowei += " <td style=\"color: grey;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=\"color: grey;text-align: center;\" > " + Number + " </td>  <td style=\"text-align:center\">  <span style=\"color:green;\" >" + (nums - LessNumber - Number) + " </span></td>";
                 }
 
 

--
Gitblit v1.9.1