From 68ff182a8b7cffaead3e3f89d8e123d7a6821557 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 十一月 2025 13:02:14 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 9 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.designer.cs | 35 +++++++++++
CY_ECommercePlatform/CY.WebForm/images/zuzhijiagou.png | 0
CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx | 69 +++++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.cs | 38 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs | 12 ++-
6 files changed, 158 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index dc8c698..b8c4fb0 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -480,6 +480,7 @@
<Content Include="images\pay\宸ュ晢閾惰.gif" />
<Content Include="images\pay\寤鸿閾惰.gif" />
<Content Include="images\pay\閭斂.jpg" />
+ <Content Include="images\zuzhijiagou.png" />
<Content Include="Index.aspx" />
<Content Include="js\anonymous\RegisterVerify.js" />
<Content Include="js\business\Custom.js" />
@@ -2819,6 +2820,7 @@
<Content Include="Pages\work\BaoxiaoFukuanList.aspx" />
<Content Include="Pages\work\BaoxiaoPiliangReply.aspx" />
<Content Include="Pages\work\BaoxiaoReplyList.aspx" />
+ <Content Include="Pages\work\Gongzuozuzhijiagou.aspx" />
<Content Include="Pages\work\GongzuoneirongList.aspx" />
<Content Include="Pages\work\GongzuoneirongEdit.aspx" />
<Content Include="Pages\work\MyvisitDetail.aspx" />
@@ -9334,6 +9336,13 @@
<Compile Include="Pages\work\BaoxiaoReplyList.aspx.designer.cs">
<DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\Gongzuozuzhijiagou.aspx.cs">
+ <DependentUpon>Gongzuozuzhijiagou.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\Gongzuozuzhijiagou.aspx.designer.cs">
+ <DependentUpon>Gongzuozuzhijiagou.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\GongzuoneirongList.aspx.cs">
<DependentUpon>GongzuoneirongList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
index 69f1448..c32b284 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -57,8 +57,8 @@
this.hideOrderId.Value = orderIdStr;
//var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+ var coreCmsPlanOrderFahuosssssss = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
-
var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
var BeginDate = this.txtBeginDate.Value.Trim();
@@ -72,6 +72,7 @@
{
var sss = EndDate.ToDateTime2().Value.AddDays(1);
coreCmsPlanOrderFahuos = coreCmsPlanOrderFahuos.Where(x => x.createTime <= sss);
+ coreCmsPlanOrderFahuosssssss = coreCmsPlanOrderFahuosssssss.Where(x => x.createTime <= sss);
}
@@ -117,12 +118,13 @@
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = coreCmsPlanOrderFahuos.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x => x.nums);
-
+ var numsyifa = coreCmsPlanOrderFahuosssssss.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x => x.nums);
+
var ssss = 0;
int.TryParse(inquiryWorkBookModel.WorkBookCount, out ssss);
- biaowei += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - nums) + " </span></td>";
+ biaowei += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - numsyifa) + " </span></td>";
}
@@ -145,11 +147,11 @@
foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
{
var nums = cmsPlanOrderFahuos1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).Sum(x=>x.nums);
-
+ var numsyifa = coreCmsPlanOrderFahuosssssss.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt && x.createTime.Value <= cmsPlanOrderFahuo.createTime).Sum(x => x.nums);
var ssss = 0;
int.TryParse(inquiryWorkBookModel.WorkBookCount, out ssss);
- cmsPlanOrderFahuo.biaoge += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - nums) + " </span></td>";
+ cmsPlanOrderFahuo.biaoge += " <td style=\"text-align:center\"> " + nums + " </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >" + (ssss - numsyifa) + " </span></td>";
//if (cmsPlanOrderItem != null)
//{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx
new file mode 100644
index 0000000..20e1a5b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx
@@ -0,0 +1,69 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Gongzuozuzhijiagou.aspx.cs" Inherits="CY.WebForm.Pages.work.Gongzuozuzhijiagou" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <title>璁惧鍒嗙被绠＄悊</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/GongzuoneirongCateEdit.aspx?keyid=" + keyid, Title: "璁惧鍒嗙被淇敼", Width: 500, Height: 430 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/work/GongzuoneirongCateEdit.aspx", Title: "鏂板璁惧鍒嗙被", Width: 500, Height: 430 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁惧鍒嗙被鍚楋紵", function () {
+ window.location = "/Pages/work/Gongzuozuzhijiagou.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁惧鍒嗙被", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎澶囧垎绫诲悧锛�", function () {
+ window.location = "/Pages/work/Gongzuozuzhijiagou.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+
+ .full-image {
+ border: none; /* 绉婚櫎杈规 */
+}
+
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+
+ <img alt="xxxx" class="full-image" width="636" height="662" src="../../images/zuzhijiagou.png" />
+
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.cs
new file mode 100644
index 0000000..2738bd1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.cs
@@ -0,0 +1,38 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧鍒嗙被绠＄悊
+ public partial class Gongzuozuzhijiagou : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_GongzuoneirongCateBLL bll_OA_GongzuoneirongCateBLL = null;
+
+ //鍒濆鍖�
+ public Gongzuozuzhijiagou()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_GongzuoneirongCateBLL = new OA_GongzuoneirongCateBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.designer.cs
new file mode 100644
index 0000000..c250cab
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/Gongzuozuzhijiagou.aspx.designer.cs
@@ -0,0 +1,35 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class Gongzuozuzhijiagou
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/images/zuzhijiagou.png b/CY_ECommercePlatform/CY.WebForm/images/zuzhijiagou.png
new file mode 100644
index 0000000..4e5ff22
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/images/zuzhijiagou.png
Binary files differ
--
Gitblit v1.9.1