From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 （1）“印刷、打包、送货要求”放在右边的格子里面；右边格子拉通 （2）“单价”和“总价”的格子比例要调整适中 （3）把“印件名称”放在第一格 （1）操作中增加“问题处理”，进行处理操作 完成 （2）问题反馈除了生成在这个列表中，还要自动推送给对应订单的下单人或者送货安排（发起工作安排）的安排人，显示在他们的“工作提醒”中，处理完了就在列表中变成已完成问题处理，显示“√”，点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中，选“轮转印刷机”的，删除“纸张数量（张）”和“开料规格” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
index 449b060..652efc7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -64,7 +64,7 @@
// var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value);
- var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=>x.OrderState == 2);
+ var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value);
var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
@@ -93,7 +93,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);
var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
@@ -134,7 +134,8 @@
// 缁熻缁撴灉
//Count = g.Count(), // 姣忕粍浜烘暟
//AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
- Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ Number = g.Sum(p => p.Number), // 宸ヨ祫鎬诲拰
+ LessNumber = g.Sum(p => p.LessNumber)
}).ToList();
@@ -153,13 +154,14 @@
if (coreDeliverOrderItem != null)
{
cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ cmsPlanOrderItem.LessNumber = coreDeliverOrderItem.LessNumber;
}
cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
- cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums - cmsPlanOrderItem.LessNumber;
}
@@ -206,16 +208,16 @@
for (int i = 0; i < fahuos.Length; i++)
{
var fahuo = fahuos[i].ToInt32();
- if (fahuo.HasValue && fahuo.Value > 0)
+ if (fahuo.HasValue && fahuo.Value != 0)
{
yanzheng = true;
}
- var weifahuonums = weifahuonumss[i].ToInt32();
- if(fahuo.Value > weifahuonums.Value)
- {
- JavaScript.MessageBox((i+1)+"琛屽彂璐ф暟閲忓ぇ浜庢湭鍙戣揣鏁伴噺", this);
- return;
- }
+ //var weifahuonums = weifahuonumss[i].ToInt32();
+ //if(fahuo.Value > weifahuonums.Value)
+ //{
+ // JavaScript.MessageBox((i+1)+"琛屽彂璐ф暟閲忓ぇ浜庢湭鍙戣揣鏁伴噺", this);
+ // return;
+ //}
}
@@ -224,6 +226,7 @@
JavaScript.MessageBox( "娌℃湁濉啓鍙戣揣鏁伴噺", this);
return;
}
+ var createtimea = DateTime.Now;
var ssss = false;
for (int i = 0; i < fahuos.Length; i++)
{
@@ -232,7 +235,7 @@
coreCmsPlanOrder.name = names[i];
coreCmsPlanOrder.specification = specifications[i];
coreCmsPlanOrder.nums = fahuos[i].ToInt32().Value;
- coreCmsPlanOrder.createTime = DateTime.Now;
+ coreCmsPlanOrder.createTime = createtimea;
coreCmsPlanOrder.upDataTime = coreCmsPlanOrder.createTime;
coreCmsPlanOrder.createBy = CurrentUser.ShortName;
coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
--
Gitblit v1.9.1