From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +0800
Subject: [PATCH] 你们明天在那个公文管理公文管理那个操作操作界面增加一个审核， 好点审核呢，实际上是修改这个只有我才有一个权限， 只是只有我一个人，因为现在来看他们。相当于说， 没经过我审核，他们整些你看嘛，发你妈一些公文， 像狗屎一样，格式都不对头，在这儿乱在这儿乱写啊， 必须就是我，我审核，我点审核，你相就是复制一个修改过嘛， 相当于就是。好，必须是我，我点了审核好后头我修改好了， 提交好了才能发布。只要我没在审核里头的话，好，这个就发布不了 。好怀疑着呢，怀疑怀疑着来修改，还是在修改里头整？
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs | 166 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 129 insertions(+), 37 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
index d3e7dc9..5cb53b7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookSonghuo.aspx.cs
@@ -41,13 +41,13 @@
{
- BindList();
+ BindList("diyici");
}
}
//缁戝畾鏁版嵁
- private void BindList()
+ private void BindList(string diyici="")
{
string orderIdStr = Request["orderId"];
this.hideOrderId.Value = orderIdStr;
@@ -79,11 +79,11 @@
}
var OrderState = this.selstatus.Value.Trim();
- if (!string.IsNullOrEmpty(OrderState))
- {
- var sss = OrderState.ToInt32().Value;
- coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
- }
+ //if (!string.IsNullOrEmpty(OrderState))
+ //{
+ // var sss = OrderState.ToInt32().Value;
+ // coreDeliverOrderItems = coreDeliverOrderItems.Where(x => x.OrderState == sss);
+ //}
@@ -112,36 +112,18 @@
}
biaotou +="</tr><tr>"+ biaotou2+ "</tr>";
}
- biaowei = " <td style=\"text-align:center\"> 鍚堣 </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).Sum(x => x.nums);
-
- var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
-
- 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>";
- }
-
-
-
- }
-
- foreach(var coreCmsPlanOrder in coreCmsPlanOrders)
+ List<int> PlanOrderid = new List<int>();
+
+
+ foreach (var coreCmsPlanOrder in coreCmsPlanOrders)
{
var cmsPlanOrderItems1 = cmsPlanOrderItems.Where(x => x.orderId == coreCmsPlanOrder.id);
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
+ string biaoge = "";
var cmsPlanOrderItem = cmsPlanOrderItems1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).FirstOrDefault();
if (cmsPlanOrderItem != null)
{
@@ -154,16 +136,16 @@
{
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>";
+ 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>";
+ 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\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
}
@@ -171,17 +153,127 @@
}
else
{
- coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
+ biaoge += " <td style=\"text-align:center\"> </td> <td style=\"text-align:center\"> <span style=\"color:green;\" ></span></td> ";
}
-
+
+ if (string.IsNullOrEmpty(OrderState))
+ {
+
+ if (string.IsNullOrEmpty(diyici))
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ else
+ {
+ 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);
+ }
+ }
+ }
+
+
+ }
+ else if (OrderState == "0")
+ {
+ 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 (OrderState == "1")
+ {
+ 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 + jieyueshuliang < jihuashuliang && jihuashuliang > 0 && songhuoshuliang + jieyueshuliang > 0)
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ }
+ else if (OrderState == "2")
+ {
+ 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 + jieyueshuliang >= jihuashuliang && jihuashuliang>0)
+ {
+ coreCmsPlanOrder.biaoge += biaoge;
+ if (PlanOrderid.Count(x => x == coreCmsPlanOrder.id) == 0)
+ {
+ PlanOrderid.Add(coreCmsPlanOrder.id);
+ }
+ }
+ }
+
+
}
}
-
- this.RepClientList.DataSource = coreCmsPlanOrders;
+ biaowei = " <td style=\"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);
+
+ var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x => x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt && PlanOrderid.Contains(x.PlanOrderId));
+
+ 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>";
+ }
+
+
+
+ }
+
+
+
+ this.RepClientList.DataSource = coreCmsPlanOrders.Where(x=> PlanOrderid.Contains(x.id));
this.RepClientList.DataBind();
}
--
Gitblit v1.9.1