From 389b4da5feedfc0b49d7c6540bc836267d7bbee0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 九月 2025 08:46:15 +0800
Subject: [PATCH] 作业本送货 加上客户单位 完成 订单状态默认未送货 完成
---
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 1
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.designer.cs | 71 +
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx | 10
CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderFahuoBLL.cs | 106 ++
CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderFahuoDAL.cs | 32
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 17
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 10
CY_ECommercePlatform/AbstractFactory/Factory.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.designer.cs | 71 +
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs | 4
CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderFahuoDAL.cs | 221 ++++++
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs | 27
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx | 44 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.designer.cs | 89 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx | 171 ++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx | 184 +++++
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 1
CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderFahuo.cs | 155 ++++
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs | 264 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs | 186 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx | 166 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs | 187 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 19
33 files changed, 2,086 insertions(+), 28 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 1bcc76b..0ec717a 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -273,6 +273,7 @@
OBJECT_PATH.Add(DALInterface.IOA_ShiJuanBiaoQianDAL, "OA_ShiJuanBiaoQianDAL");
OBJECT_PATH.Add(DALInterface.IAdm_tongxunluDAL, "Adm_tongxunluDAL");
OBJECT_PATH.Add(DALInterface.IAdm_zhanghaomimaDAL, "Adm_zhanghaomimaDAL");
+ OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderFahuoDAL, "CoreCmsPlanOrderFahuoDAL");
OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -954,6 +955,11 @@
/// </summary>
IAdm_zhanghaomimaDAL = 1945,
+ /// <summary>
+ /// 璐﹀彿瀵嗙爜
+ /// </summary>
+ ICoreCmsPlanOrderFahuoDAL = 1946,
+
/// <summary>
/// 寮�绁ㄧ敵璇�
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index c4ccfeb..a503ba3 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -156,6 +156,7 @@
<Compile Include="OA\Adm_tongxunluBLL.cs" />
<Compile Include="OA\Adm_zhanghaomimaBLL.cs" />
<Compile Include="OA\CoreCmsPlanOrderBLL.cs" />
+ <Compile Include="OA\CoreCmsPlanOrderFahuoBLL.cs" />
<Compile Include="OA\CoreCmsPlanOrderItemBLL.cs" />
<Compile Include="OA\OA_BaozhengjinBLL.cs" />
<Compile Include="OA\OA_BaozhengjincuishouBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index b623bbf..9095c40 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -92,9 +92,9 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+ public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
{
- return _eC_OrderBasicDAL.SelectModelPageWorkBook(pagination, _MemberID, txtBeginDate, txtEndDate, txtOrderId, txtSearchyjname, selCustormerManager, selBusinessManager, selOrderStates);
+ return _eC_OrderBasicDAL.SelectModelPageWorkBook(pagination, _MemberID, txtBeginDate, txtEndDate, txtOrderId, txtSearchyjname, selCustormerManager, selBusinessManager, selOrderStates, BuyerName);
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderFahuoBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderFahuoBLL.cs
new file mode 100644
index 0000000..2ef53f4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreCmsPlanOrderFahuoBLL.cs
@@ -0,0 +1,106 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class CoreCmsPlanOrderFahuoBLL
+ {
+ ICoreCmsPlanOrderFahuoDAL _ICoreCmsPlanOrderFahuoDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public CoreCmsPlanOrderFahuoBLL()
+ {
+ //鑾峰彇CoreCmsPlanOrderFahuo DAL瀹炵幇
+ _ICoreCmsPlanOrderFahuoDAL = Factory.GetDALByInterfaceName(DALInterface.ICoreCmsPlanOrderFahuoDAL) as ICoreCmsPlanOrderFahuoDAL;
+
+
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public bool InsertModel(CY.Model.CoreCmsPlanOrderFahuo m_CoreCmsPlanOrderFahuo)
+ {
+ try
+ {
+
+ return _ICoreCmsPlanOrderFahuoDAL.InserModel(m_CoreCmsPlanOrderFahuo);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.CoreCmsPlanOrderFahuo m_CoreCmsPlanOrderFahuo)
+ {
+ try
+ {
+ return _ICoreCmsPlanOrderFahuoDAL.UpdateModel(m_CoreCmsPlanOrderFahuo);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreCmsPlanOrderFahuo> GetModelList()
+ {
+ Query query = new Query();
+ return _ICoreCmsPlanOrderFahuoDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="orderid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<CoreCmsPlanOrderFahuo> GetModelsByOrderid(int orderid)
+ {
+ Query query = new Query();
+ return _ICoreCmsPlanOrderFahuoDAL.GetModelsByOrderid(orderid);
+ }
+
+
+
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public CoreCmsPlanOrderFahuo GetModelByKeyid(int keyid)
+ {
+
+ return _ICoreCmsPlanOrderFahuoDAL.getCoreCmsPlanOrderFahuo(keyid);
+ }
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 09682a3..1712c71 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -159,6 +159,7 @@
<Compile Include="OA\IAdm_tongxunluDAL.cs" />
<Compile Include="OA\IAdm_zhanghaomimaDAL.cs" />
<Compile Include="OA\ICoreCmsPlanOrderDAL.cs" />
+ <Compile Include="OA\ICoreCmsPlanOrderFahuoDAL.cs" />
<Compile Include="OA\ICoreCmsPlanOrderItemDAL.cs" />
<Compile Include="OA\IOA_BaozhengjincuishouDAL.cs" />
<Compile Include="OA\IOA_BaozhengjinDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index f686d90..702b335 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -77,7 +77,7 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates);
+ IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName);
/// <summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderFahuoDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderFahuoDAL.cs
new file mode 100644
index 0000000..1d25600
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/ICoreCmsPlanOrderFahuoDAL.cs
@@ -0,0 +1,32 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ public interface ICoreCmsPlanOrderFahuoDAL : ICommonDAL, IPaging<CoreCmsPlanOrderFahuo>, IGetAllModel<CoreCmsPlanOrderFahuo>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ CoreCmsPlanOrderFahuo getCoreCmsPlanOrderFahuo(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁orderid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<CoreCmsPlanOrderFahuo> GetModelsByOrderid(int orderid);
+
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 8325c3e..f72234f 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -202,6 +202,7 @@
<Compile Include="OA\Adm_tongxunlu.cs" />
<Compile Include="OA\Adm_zhanghaomima.cs" />
<Compile Include="OA\CoreCmsPlanOrder.cs" />
+ <Compile Include="OA\CoreCmsPlanOrderFahuo.cs" />
<Compile Include="OA\CoreCmsPlanOrderItem.cs" />
<Compile Include="OA\CoreDeliverOrderItem.cs" />
<Compile Include="OA\EC_OrderLiuyang.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderFahuo.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderFahuo.cs
new file mode 100644
index 0000000..9bcbcbe
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderFahuo.cs
@@ -0,0 +1,155 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+
+ /// <summary>
+ /// 璁″垝璁㈠崟鍙戣揣琛�
+ /// </summary>
+ [Serializable]
+ public partial class CoreCmsPlanOrderFahuo : IAggregateRoot
+ {
+
+ public CoreCmsPlanOrderFahuo()
+ {
+ }
+
+ #region Model
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ public System.Int32 id { get; set; }
+ /// <summary>
+ /// 璁㈠崟ID 鍏宠仈order.id
+ /// </summary>
+ public System.Int32 orderId { get; set; }
+
+
+ /// <summary>
+ /// 鍟嗗搧鍚嶇О
+ /// </summary>
+ public System.String name { get; set; }
+
+
+ /// <summary>
+ /// biaoge
+ /// </summary>
+ public System.String biaoge { get; set; }
+
+
+
+ /// <summary>
+ /// 鍟嗗搧瑙勬牸
+ /// </summary>
+ public System.String specification { get; set; }
+
+
+
+
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ public System.Int32 nums { get; set; }
+
+
+
+
+ /// <summary>
+ /// 寤虹珛鏃堕棿
+ /// </summary>
+ public DateTime? createTime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? upDataTime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string createBy { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string upDataBy { get; set; }
+
+
+ #endregion Model
+
+ #region Visiter
+
+ /// <summary>
+ /// 灞炴�ц闂櫒
+ /// </summary>
+ /// <param name="name">灞炴�у悕</param>
+ /// <param name="index">绱㈠紩</param>
+ /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+ /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+ /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+ public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+ {
+ object theValue = null;
+
+
+ if ("id".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.id = isChange ? MyConvert.ConvertToInt32(value).Value : id;
+ theValue = this.id;
+ }
+ else if ("orderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.orderId = isChange ? MyConvert.ConvertToInt32(value).Value : orderId;
+ theValue = this.orderId;
+ }
+ else if ("name".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.name = isChange ? MyConvert.ConvertToString(value) : name;
+ theValue = this.name;
+ }
+ else if ("specification".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.specification = isChange ? MyConvert.ConvertToString(value) : specification;
+ theValue = this.specification;
+ }
+
+
+ else if ("nums".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.nums = isChange ? MyConvert.ConvertToInt32(value).Value : nums;
+ theValue = this.nums;
+ }
+
+
+ else if ("createTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+ {
+ this.createTime = isChange ? MyConvert.ConvertToDateTime(value) : createTime;
+ theValue = this.createTime;
+ }
+ else if ("upDataTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+ {
+ this.upDataTime = isChange ? MyConvert.ConvertToDateTime(value) : upDataTime;
+ theValue = this.upDataTime;
+ }
+ else if ("createBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+ {
+ this.createBy = isChange ? MyConvert.ConvertToString(value) : createBy;
+ theValue = this.createBy;
+ }
+ else if ("upDataBy".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.upDataBy = isChange ? MyConvert.ConvertToString(value) : upDataBy;
+ theValue = this.upDataBy;
+ }
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
index a356979..a112db5 100644
--- a/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/CoreCmsPlanOrderItem.cs
@@ -98,6 +98,33 @@
/// </summary>
public System.String neiye { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣鏁伴噺
+ /// </summary>
+ public System.Int32 fahuonums { get; set; }
+
+ /// <summary>
+ /// 鏈彂璐ф暟閲�
+ /// </summary>
+ public System.Int32 weifahuonums { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鏁伴噺
+ /// </summary>
+ public System.Int32 songhuonums { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ public System.Int32 kucunnums { get; set; }
+
+ /// <summary>
+ /// 鏈�佽揣鏁伴噺
+ /// </summary>
+ public System.Int32 weisonghuonums { get; set; }
+
+
#endregion Model
#region Visiter
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 499a268..36698b1 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -172,6 +172,7 @@
<Compile Include="OA\Adm_tongxunluDAL.cs" />
<Compile Include="OA\Adm_zhanghaomimaDAL.cs" />
<Compile Include="OA\CoreCmsPlanOrderDAL.cs" />
+ <Compile Include="OA\CoreCmsPlanOrderFahuoDAL.cs" />
<Compile Include="OA\CoreCmsPlanOrderItemDAL.cs" />
<Compile Include="OA\OA_BaozhengjincuishouDAL.cs" />
<Compile Include="OA\OA_BaozhengjinDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 1eb2893..885bfba 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1339,7 +1339,7 @@
/// </summary>
/// <param name="pagination"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates)
+ public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
{
try
{
@@ -1364,6 +1364,9 @@
if (!string.IsNullOrEmpty(txtSearchyjname))
condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
+ if (!string.IsNullOrEmpty(BuyerName))
+ condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
if (!string.IsNullOrEmpty(selCustormerManager))
condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
@@ -1371,7 +1374,17 @@
condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
if (!string.IsNullOrEmpty(selOrderStates))
- condition += " and ob.OrderState = '" + selOrderStates + "'";
+ {
+ if(selOrderStates == "0")
+ {
+ condition += " and ob.OrderState in (1,2,3,4)";
+ }
+ else if (selOrderStates == "1")
+ {
+ condition += " and ob.OrderState in ( 5,6,-1)";
+ }
+ }
+
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderFahuoDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderFahuoDAL.cs
new file mode 100644
index 0000000..0b33b87
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/CoreCmsPlanOrderFahuoDAL.cs
@@ -0,0 +1,221 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+
+namespace CY.SQLDAL
+{
+ public class CoreCmsPlanOrderFahuoDAL: ICoreCmsPlanOrderFahuoDAL
+ {
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ";
+ const string FROMSOUCEEND = " ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " SellerOrderId desc ";
+ #endregion
+ public CoreCmsPlanOrderFahuoDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreCmsPlanOrderFahuo trueModel = model as Model.CoreCmsPlanOrderFahuo;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@orderId",trueModel.orderId),
+ new SqlParameter("@name",trueModel.name),
+ new SqlParameter("@specification",trueModel.specification),
+
+ new SqlParameter("@nums",trueModel.nums),
+
+ new SqlParameter("@createTime",trueModel.createTime),
+ new SqlParameter("@upDataTime",trueModel.upDataTime),
+ new SqlParameter("@upDataBy",trueModel.upDataBy),
+ new SqlParameter("@createBy",trueModel.createBy),
+
+
+ };
+ string sql = "Insert Into CoreCmsPlanOrderFahuo ([orderId],[name],[specification] , [nums] , [createTime],[upDataTime], [upDataBy],[createBy] )"
+ + " Values ( @orderId,@name,@specification, @nums , @createTime, @upDataTime, @upDataBy,@createBy )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreCmsPlanOrderFahuo trueModel = model as Model.CoreCmsPlanOrderFahuo;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@id",trueModel.id),
+ new SqlParameter("@orderId",trueModel.orderId),
+ new SqlParameter("@name",trueModel.name),
+ new SqlParameter("@specification",trueModel.specification),
+
+ new SqlParameter("@nums",trueModel.nums),
+
+ new SqlParameter("@upDataTime",trueModel.upDataTime),
+ new SqlParameter("@upDataBy",trueModel.upDataBy),
+
+
+ };
+ string sql = "Update CoreCmsPlanOrderFahuo Set [orderId]=@orderId,[name]=@name,[specification]=@specification , [nums]=@nums , [upDataTime]=@upDataTime,[upDataBy]=@upDataBy where [id] =@id ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public CoreCmsPlanOrderFahuo getCoreCmsPlanOrderFahuo(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (!keyid.Equals(Guid.Empty))
+ {
+ condition = " id='" + keyid + "'";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<CoreCmsPlanOrderFahuo> result = _dataBase.SelectModel<CoreCmsPlanOrderFahuo>("*", "CoreCmsPlanOrderFahuo", condition) as IList<CoreCmsPlanOrderFahuo>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreCmsPlanOrderFahuo> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.CoreCmsPlanOrderFahuo>(" * ", " CoreCmsPlanOrderFahuo ") as IList<Model.CoreCmsPlanOrderFahuo>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreCmsPlanOrderFahuo> GetModelsByOrderid(int orderid)
+ {
+ return _dataBase.SelectModel<Model.CoreCmsPlanOrderFahuo>(" * ", " CoreCmsPlanOrderFahuo ", " orderId = " + orderid + "") as IList<Model.CoreCmsPlanOrderFahuo>;//鎵ц鏌ヨ
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.CoreCmsPlanOrderFahuo> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+
+ return null;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.CoreCmsPlanOrderItem trueModel = model as Model.CoreCmsPlanOrderItem;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.id)
+ };
+ string sql = "Delete [CoreCmsPlanOrderFahuo] Where [id] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index e9829ce..bbe7292 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -412,6 +412,16 @@
if (EndPlanStartTime.HasValue)
condition += string.Format(" and CAST(a.PlanStartTime AS DATE) <='{0}'", EndPlanStartTime);
+
+ decimal heji1 = 0;
+ var ssss = _dataBase.SelectModel<Model.OA_WorkPlan>(" sum(a.[PlanMoney]) as PlanMoney ", " OA_WorkPlan AS a ", condition);
+ if (ssss.Count > 0)
+ {
+ var aaaaa = ssss.First();
+ heji1 += (aaaaa.PlanMoney.HasValue ? aaaaa.PlanMoney.Value : 0);
+ }
+ pagination.heji1 = heji1;
+
return _dataBase.SelectModelPage<Model.OA_WorkPlan>(pagination, " a.*,b.Name as SentStaffName,c.Name as ReciveStaffName,d.Name as ApprovalStaffName,e.Name as EvaluationStaff,f.Name as PlanDataTypeName ", " OA_WorkPlan AS a LEFT JOIN dbo.EC_MemberBasic AS b ON a.SentStaffId = b.MemberId LEFT JOIN dbo.EC_MemberBasic AS c ON a.ReciveStaffId = c.MemberId LEFT JOIN dbo.EC_MemberBasic AS d ON a.ApprovalStaffId = d.MemberId LEFT JOIN dbo.EC_MemberBasic AS e ON a.EvaluationStaffId = e.MemberId LEFT JOIN dbo.Sys_Dictionary AS f ON a.PlanDataType = f.MeanValue AND f.DicType='宸ヤ綔璁″垝鎬ц川' ", " a.PlanStartTime desc", " PlanStartTime desc ", condition);
}
catch (Exception ex)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 4362386..46b2509 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1903,6 +1903,9 @@
<Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx" />
<Content Include="Pages\business\DeliverPlanTimeEdit.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookPandian.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookFahuo.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx" />
<Content Include="Pages\business\ShejiOrderDeatil.aspx" />
<Content Include="Pages\business\ShejiOrderList.aspx" />
<Content Include="Pages\business\SHejiOrderEdit.aspx" />
@@ -3491,6 +3494,27 @@
<Compile Include="Pages\business\DeliverPlanTimeEdit.aspx.designer.cs">
<DependentUpon>DeliverPlanTimeEdit.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPandian.aspx.cs">
+ <DependentUpon>DeliverWorkBookPandian.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPandian.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookPandian.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookFahuo.aspx.cs">
+ <DependentUpon>DeliverWorkBookFahuo.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookFahuo.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookFahuo.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx.cs">
+ <DependentUpon>DeliverWorkBookfahuoqingkuang.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookfahuoqingkuang.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\FileUploadHandler.ashx.cs">
<DependentUpon>FileUploadHandler.ashx</DependentUpon>
</Compile>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx
new file mode 100644
index 0000000..96714d6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx
@@ -0,0 +1,184 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookFahuo.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookFahuo" %>
+
+<!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 id="Head1" runat="server">
+ <title>杞﹁締绠＄悊</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濋櫓
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/DeliverWorkBookFahuo.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/business/DeliverWorkBookFahuo.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <span id="spanBuyerName" runat="server" ></span>
+ <input type="hidden" id="hideOrderId" runat="server" />
+ </td>
+
+
+
+
+
+ <%-- <td colspan="8">
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" runat="server" id="hideOrderId" />
+ </td>--%>
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th style="text-align: center">
+ 鍝佺
+ </th>
+ <th style="text-align: center">
+ 璁㈠崟鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鍙戣揣鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鏈彂璐ф暟閲�
+ </th>
+ <th style="text-align: center">
+ 宸查�佽揣鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 搴撳瓨鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鏈�佽揣鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鏂板鍙戣揣
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center">
+ <%#Eval("specification")%> <%#Eval("name")%>
+ <input type="hidden" name="hidspecification" value="<%#Eval("specification")%>" />
+ <input type="hidden" name="hidname" value="<%#Eval("name")%>" />
+ <input type="hidden" name="hidweifahuonums" value="<%#Eval("weifahuonums")%>" />
+ </td>
+ <td style="text-align: center">
+ <%#Eval("nums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("fahuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("weifahuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("songhuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("kucunnums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("weisonghuonums")%>
+ </td>
+ <td style="text-align: center">
+ <input type="text" name="fahuoCount" style="height: 15px; line-height: 15px; width:80px;" class="validateInt req" defaultValue="0" value="0"/>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ <tr>
+ <td colspan="8" align="center">
+ <asp:Button ID="btn_submit" runat="server" Text="鎻愪氦" OnClick="btn_Submit_form" />
+ </td>
+ </tr>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
new file mode 100644
index 0000000..449b060
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.cs
@@ -0,0 +1,264 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookFahuo : BasePage
+ {
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ CoreCmsPlanOrderFahuoBLL bll_coreCmsPlanOrderFahuoBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverWorkBookFahuo()
+ {
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ bll_coreCmsPlanOrderFahuoBLL = new CoreCmsPlanOrderFahuoBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ string orderIdStr = Request["orderId"];
+ this.hideOrderId.Value = orderIdStr;
+
+
+ var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderIdStr.ToInt32().Value);
+ if (eC_OrderBasic != null)
+ {
+ spanBuyerName.InnerText = eC_OrderBasic.BuyerName;
+ }
+
+ // var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value);
+
+ var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=>x.OrderState == 2);
+
+ var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
+
+
+ ////璁㈠崟鏁伴噺缁熻
+ //var cmsPlanOrderItemsgroup = cmsPlanOrderItems.GroupBy(p => new { p.name, p.specification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ //.Select(g => new CoreCmsPlanOrderItem
+ //{
+ // // 鍒嗙粍瀛楁
+ // name = g.Key.name,
+ // specification = g.Key.specification,
+ // // 缁熻缁撴灉
+ // //Count = g.Count(), // 姣忕粍浜烘暟
+ // //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ // nums = g.Sum(p => p.nums) // 宸ヨ祫鎬诲拰
+ //}).ToList();
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderIdStr.ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+ }
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
+
+ var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ var coreCmsPlanOrder = new CoreCmsPlanOrderItem();
+ // biaotou += " <th style=\"text-align:center\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+
+ coreCmsPlanOrder.name = inquiryWorkBookModel.WorkBookNameTxt;
+ coreCmsPlanOrder.specification = inquiryWorkBookModel.WorkBookSizeTxt;
+ var sss = inquiryWorkBookModel.WorkBookCount.ToInt32();
+ coreCmsPlanOrder.nums = sss.HasValue ? sss.Value : 0;
+ cmsPlanOrderItemsgroup.Add(coreCmsPlanOrder);
+
+ }
+
+
+ //鍙戣揣鏁伴噺缁熻
+ var coreCmsPlanOrderFahuosgroup = coreCmsPlanOrderFahuos.GroupBy(p => new { p.name, p.specification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreCmsPlanOrderFahuo
+ {
+ // 鍒嗙粍瀛楁
+ name = g.Key.name,
+ specification = g.Key.specification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ nums = g.Sum(p => p.nums) // 宸ヨ祫鎬诲拰
+ }).ToList();
+
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemsgroup = coreDeliverOrderItems.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ }).ToList();
+
+
+
+
+ foreach(var cmsPlanOrderItem in cmsPlanOrderItemsgroup)
+ {
+ var coreCmsPlanOrderFahuo = coreCmsPlanOrderFahuosgroup.FirstOrDefault(x => x.name == cmsPlanOrderItem.name && x.specification == cmsPlanOrderItem.specification);
+ if (coreCmsPlanOrderFahuo != null)
+ {
+ cmsPlanOrderItem.fahuonums = coreCmsPlanOrderFahuo.nums;
+ }
+ cmsPlanOrderItem.weifahuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.fahuonums;
+
+ var coreDeliverOrderItem = coreDeliverOrderItemsgroup.FirstOrDefault(x => x.ZYBName == cmsPlanOrderItem.name && x.ZYBSpecification == cmsPlanOrderItem.specification);
+ if (coreDeliverOrderItem != null)
+ {
+ cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ }
+
+
+ cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
+
+
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ }
+
+
+
+
+
+
+
+
+
+ this.RepClientList.DataSource = cmsPlanOrderItemsgroup;
+ this.RepClientList.DataBind();
+
+ }
+
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+
+ var orderIdStr = this.hideOrderId.Value ;
+
+ var hidspecification = Request["hidspecification"];
+ var hidname = Request["hidname"];
+ var fahuoCount = Request["fahuoCount"];
+ var hidweifahuonums = Request["hidweifahuonums"];
+
+ var fahuos = fahuoCount.Split(',');
+ var names = hidname.Split(',');
+ var specifications = hidspecification.Split(',');
+ var weifahuonumss = hidweifahuonums.Split(',');
+
+ bool yanzheng = false;
+
+ for (int i = 0; i < fahuos.Length; i++)
+ {
+ var fahuo = fahuos[i].ToInt32();
+ if (fahuo.HasValue && fahuo.Value > 0)
+ {
+ yanzheng = true;
+ }
+ var weifahuonums = weifahuonumss[i].ToInt32();
+ if(fahuo.Value > weifahuonums.Value)
+ {
+ JavaScript.MessageBox((i+1)+"琛屽彂璐ф暟閲忓ぇ浜庢湭鍙戣揣鏁伴噺", this);
+ return;
+ }
+
+ }
+
+ if (!yanzheng)
+ {
+ JavaScript.MessageBox( "娌℃湁濉啓鍙戣揣鏁伴噺", this);
+ return;
+ }
+ var ssss = false;
+ for (int i = 0; i < fahuos.Length; i++)
+ {
+ var coreCmsPlanOrder = new CoreCmsPlanOrderFahuo();
+ coreCmsPlanOrder.orderId = orderIdStr.ToInt32().Value;
+ coreCmsPlanOrder.name = names[i];
+ coreCmsPlanOrder.specification = specifications[i];
+ coreCmsPlanOrder.nums = fahuos[i].ToInt32().Value;
+ coreCmsPlanOrder.createTime = DateTime.Now;
+ coreCmsPlanOrder.upDataTime = coreCmsPlanOrder.createTime;
+ coreCmsPlanOrder.createBy = CurrentUser.ShortName;
+ coreCmsPlanOrder.upDataBy = CurrentUser.ShortName;
+ ssss= bll_coreCmsPlanOrderFahuoBLL.InsertModel(coreCmsPlanOrder);
+ }
+
+
+
+ //bll_EC_SpecialOrdersBLL.AddSpecialForums(m_EC_OrderOperate, m_EC_SpecialOrders, m_OA_OrderWorkListRelation, m_EC_SpecialForumsList, m_OA_InventoryList, m_OA_OutOfStorageList)
+ if (ssss)
+ {
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,true,false);
+
+ }
+ else
+ {
+
+ JavaScript.MessageBox("鎻愪氦澶辫触", this);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎻愪氦澶辫触", this);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.designer.cs
new file mode 100644
index 0000000..0f75d76
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookFahuo.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookFahuo
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <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;
+
+ /// <summary>
+ /// spanBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanBuyerName;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
index c427094..aff8af5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx
@@ -10,7 +10,10 @@
function onViewCarViolation(keyid) {
top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
}
-
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function View(personId) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?keyid=" + personId, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 580 });
+ }
//淇濆吇
function onViewCarMaintenance(keyid) {
top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
@@ -29,12 +32,25 @@
function onViewCarInsurance(keyid) {
top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookSonghuo.aspx?orderId=" + keyid, Title: "鏌ョ湅閫佽揣鎯呭喌", Width: 1500, Height: 900 });
}
+ //淇濋櫓
+ function onViewfahuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookfahuoqingkuang.aspx?orderId=" + keyid, Title: "鏌ョ湅鍙戣揣鎯呭喌", Width: 1500, Height: 900 });
+ }
+
//淇敼
function onEdit(keyid) {
top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookDetail.aspx?orderId=" + keyid, Title: "鏌ョ湅鏄庣粏", Width: 1500, Height: 900 });
}
-
+ //鏂板鍙戣揣
+ function onViewXinzengsonghuo(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookFahuo.aspx?orderId=" + keyid, Title: "鏂板鍙戣揣", Width: 1500, Height: 900 });
+ }
+ //搴撳瓨鐩樼偣
+ function onViewKucunpandian(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverWorkBookPandian.aspx?orderId=" + keyid, Title: "搴撳瓨鐩樼偣", Width: 1500, Height: 900 });
+ }
+
//娣诲姞
function addModel() {
top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
@@ -87,7 +103,7 @@
<td style="width: 215px">
<input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
</td>
- <td class="ali03">
+ <%-- <td class="ali03">
璁㈠崟缂栧彿锛�
</td>
<td>
@@ -98,6 +114,12 @@
</td>
<td>
<input id='txtSearchyjname' runat="server" maxlength='50' />
+ </td>--%>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtBuyerName' runat="server" maxlength='100' />
</td>
<td class="ali03">
瀹㈡埛缁忕悊锛�
@@ -120,6 +142,9 @@
</td>
<td>
<select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <option value="">鍏ㄩ儴</option>
+ <option value="0" selected="selected">鏈�佽揣</option>
+ <option value="1">宸查�佽揣</option>
</select>
</td>
<td colspan="8">
@@ -139,6 +164,9 @@
</th>
<th style="text-align: center">
璁㈠崟鍙�
+ </th>
+ <th style="text-align: center">
+ 瀹㈡埛鍚嶇О
</th>
<th style="text-align: center">
鍗颁欢鍚嶇О
@@ -169,6 +197,11 @@
<td style="text-align: center">
<%#Eval("SellerOrderId")%>
</td>
+ <td style="text-align: center;">
+ <div style="word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 22 ? (Eval("BuyerName").ToString().Substring(0, 22) + "..") : Eval("BuyerName").ToString()%></a>
+ </div>
+ </td>
<td style="text-align: center">
<%#Eval("DocumentName")%>
</td>
@@ -187,6 +220,11 @@
<span onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅鏄庣粏</span>
<span onclick="onDele('<%#Eval("Keyid")%>')">鎵撳嵃閫佽揣鍗�</span>
<span onclick="onViewCarInsurance('<%#Eval("Keyid")%>')">鏌ョ湅閫佽揣鎯呭喌</span>
+
+ <span menu_member_case_id="case_Xinzengsonghuo" menu_member_case_name="鏂板鍙戣揣 " onclick="onViewXinzengsonghuo('<%#Eval("Keyid")%>')">鏂板鍙戣揣 </span>
+ <span menu_member_case_id="case_Kucunpandian" menu_member_case_name="搴撳瓨鐩樼偣" onclick="onViewKucunpandian('<%#Eval("Keyid")%>')">搴撳瓨鐩樼偣</span>
+ <span onclick="onViewfahuo('<%#Eval("Keyid")%>')">鏌ョ湅鍙戣揣鎯呭喌</span>
+
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs
index 9aaca29..df8e26c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.cs
@@ -50,9 +50,9 @@
this.selBusinessManager.DataBind();
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selOrderStates.DataSource = bll_Sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
- this.selOrderStates.DataBind();
- this.selOrderStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selOrderStates.DataSource = bll_Sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
+ //this.selOrderStates.DataBind();
+ //this.selOrderStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
BindList();
}
@@ -66,7 +66,7 @@
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var eC_OrderBasics = bll_EC_OrderBasicBLL.SelectModelPageWorkBook(pa, CurrentUser.MemberId, this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(), this.txtOrderId.Value.Trim(), this.txtSearchyjname.Value.Trim(), this.selCustormerManager.Value, this.selBusinessManager.Value, this.selOrderStates.Value);
+ var eC_OrderBasics = bll_EC_OrderBasicBLL.SelectModelPageWorkBook(pa, CurrentUser.MemberId, this.txtBeginDate.Value.Trim(), this.txtEndDate.Value.Trim(),"","", this.selCustormerManager.Value, this.selBusinessManager.Value, this.selOrderStates.Value,this.txtBuyerName.Value.Trim());
foreach (var orderBasic in eC_OrderBasics)
{
EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderBasic.Keyid.Value);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs
index 9f1d723..3e79fba 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookList.aspx.designer.cs
@@ -60,22 +60,13 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
/// <summary>
- /// txtOrderId 鎺т欢銆�
+ /// txtBuyerName 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
-
- /// <summary>
- /// txtSearchyjname 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtSearchyjname;
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBuyerName;
/// <summary>
/// selCustormerManager 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx
new file mode 100644
index 0000000..bb2dfca
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx
@@ -0,0 +1,171 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookPandian.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookPandian" %>
+
+<!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 id="Head1" runat="server">
+ <title>杞﹁締绠＄悊</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濋櫓
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/DeliverWorkBookPandian.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/business/DeliverWorkBookPandian.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <span id="spanBuyerName" runat="server" ></span>
+ <input type="hidden" id="hideOrderId" runat="server" />
+ </td>
+
+
+
+
+
+ <%-- <td colspan="8">
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" runat="server" id="hideOrderId" />
+ </td>--%>
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th style="text-align: center">
+ 鍝佺
+ </th>
+ <th style="text-align: center">
+ 璁㈠崟鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鍙戣揣鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鏈彂璐ф暟閲�
+ </th>
+ <th style="text-align: center">
+ 宸查�佽揣鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 搴撳瓨鏁伴噺
+ </th>
+ <th style="text-align: center">
+ 鏈�佽揣鏁伴噺
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center">
+ <%#Eval("specification")%> <%#Eval("name")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("nums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("fahuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("weifahuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("songhuonums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("kucunnums")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("weisonghuonums")%>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
new file mode 100644
index 0000000..f756ade
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.cs
@@ -0,0 +1,186 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookPandian : BasePage
+ {
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ CoreCmsPlanOrderFahuoBLL bll_coreCmsPlanOrderFahuoBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverWorkBookPandian()
+ {
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ bll_coreCmsPlanOrderFahuoBLL = new CoreCmsPlanOrderFahuoBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ string orderIdStr = Request["orderId"];
+ this.hideOrderId.Value = orderIdStr;
+
+
+ var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderIdStr.ToInt32().Value);
+ if (eC_OrderBasic != null)
+ {
+ spanBuyerName.InnerText = eC_OrderBasic.BuyerName;
+ }
+
+ //var cmsPlanOrderItems = bll_CoreCmsPlanOrderItemBLL.GetModelsByZongOrderid(orderIdStr.ToInt32().Value);
+
+ var coreDeliverOrderItems = bll_CoreCmsPlanOrderItemBLL.GetDeliverModelsByZongOrderid(orderIdStr.ToInt32().Value).Where(x=>x.OrderState == 2);
+
+ var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
+
+
+ ////璁㈠崟鏁伴噺缁熻
+ //var cmsPlanOrderItemsgroup = cmsPlanOrderItems.GroupBy(p => new { p.name, p.specification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ //.Select(g => new CoreCmsPlanOrderItem
+ //{
+ // // 鍒嗙粍瀛楁
+ // name = g.Key.name,
+ // specification = g.Key.specification,
+ // // 缁熻缁撴灉
+ // //Count = g.Count(), // 姣忕粍浜烘暟
+ // //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ // nums = g.Sum(p => p.nums) // 宸ヨ祫鎬诲拰
+ //}).ToList();
+
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderIdStr.ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+ }
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x => x.WorkBookNameTxt).ThenBy(x => x.WorkBookSizeTxt);
+
+ var cmsPlanOrderItemsgroup = new List<CoreCmsPlanOrderItem>();
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ var coreCmsPlanOrder = new CoreCmsPlanOrderItem();
+ // biaotou += " <th style=\"text-align:center\"> " + inquiryWorkBookModel.WorkBookSizeTxt + inquiryWorkBookModel.WorkBookNameTxt + " </th> ";
+
+ coreCmsPlanOrder.name = inquiryWorkBookModel.WorkBookNameTxt;
+ coreCmsPlanOrder.specification = inquiryWorkBookModel.WorkBookSizeTxt;
+ var sss = inquiryWorkBookModel.WorkBookCount.ToInt32();
+ coreCmsPlanOrder.nums = sss.HasValue ? sss.Value : 0;
+ cmsPlanOrderItemsgroup.Add(coreCmsPlanOrder);
+
+ }
+
+
+
+ //鍙戣揣鏁伴噺缁熻
+ var coreCmsPlanOrderFahuosgroup = coreCmsPlanOrderFahuos.GroupBy(p => new { p.name, p.specification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreCmsPlanOrderFahuo
+ {
+ // 鍒嗙粍瀛楁
+ name = g.Key.name,
+ specification = g.Key.specification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ nums = g.Sum(p => p.nums) // 宸ヨ祫鎬诲拰
+ }).ToList();
+
+
+ //閫佽揣鏁伴噺缁熻
+ var coreDeliverOrderItemsgroup = coreDeliverOrderItems.GroupBy(p => new { p.ZYBName, p.ZYBSpecification }) // 澶氫釜瀛楁浣滀负鍖垮悕绫诲瀷鍒嗙粍閿�
+ .Select(g => new CoreDeliverOrderItem
+ {
+ // 鍒嗙粍瀛楁
+ ZYBName = g.Key.ZYBName,
+ ZYBSpecification = g.Key.ZYBSpecification,
+ // 缁熻缁撴灉
+ //Count = g.Count(), // 姣忕粍浜烘暟
+ //AverageSalary = g.Average(p => p.Salary), // 骞冲潎宸ヨ祫
+ Number = g.Sum(p => p.Number) // 宸ヨ祫鎬诲拰
+ }).ToList();
+
+
+
+
+ foreach(var cmsPlanOrderItem in cmsPlanOrderItemsgroup)
+ {
+ var coreCmsPlanOrderFahuo = coreCmsPlanOrderFahuosgroup.FirstOrDefault(x => x.name == cmsPlanOrderItem.name && x.specification == cmsPlanOrderItem.specification);
+ if (coreCmsPlanOrderFahuo != null)
+ {
+ cmsPlanOrderItem.fahuonums = coreCmsPlanOrderFahuo.nums;
+ }
+ cmsPlanOrderItem.weifahuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.fahuonums;
+
+ var coreDeliverOrderItem = coreDeliverOrderItemsgroup.FirstOrDefault(x => x.ZYBName == cmsPlanOrderItem.name && x.ZYBSpecification == cmsPlanOrderItem.specification);
+ if (coreDeliverOrderItem != null)
+ {
+ cmsPlanOrderItem.songhuonums = coreDeliverOrderItem.Number;
+ }
+
+
+ cmsPlanOrderItem.kucunnums = cmsPlanOrderItem.fahuonums - cmsPlanOrderItem.songhuonums;
+
+
+ cmsPlanOrderItem.weisonghuonums = cmsPlanOrderItem.nums - cmsPlanOrderItem.songhuonums;
+ }
+
+
+
+
+
+
+
+
+
+ this.RepClientList.DataSource = cmsPlanOrderItemsgroup;
+ this.RepClientList.DataBind();
+
+ }
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.designer.cs
new file mode 100644
index 0000000..5dbaacc
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookPandian.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookPandian
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <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;
+
+ /// <summary>
+ /// spanBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanBuyerName;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx
new file mode 100644
index 0000000..6995820
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx
@@ -0,0 +1,166 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverWorkBookfahuoqingkuang.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverWorkBookfahuoqingkuang" %>
+
+<!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 id="Head1" runat="server">
+ <title>杞﹁締绠＄悊</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //杩濈珷
+ function onViewCarViolation(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarViolationList.aspx?carid=" + keyid, Title: "杩濈珷绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濆吇
+ function onViewCarMaintenance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarMaintenanceList.aspx?carid=" + keyid, Title: "淇濆吇绠＄悊", Width: 1000, Height: 660 });
+ }
+ //缁翠慨
+ function onViewCarrepair(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarrepairList.aspx?carid=" + keyid, Title: "缁翠慨绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //骞存
+ function onViewCarExamined(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarExaminedList.aspx?carid=" + keyid, Title: "骞存绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇濋櫓
+ function onViewCarInsurance(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarInsuranceList.aspx?carid=" + keyid, Title: "淇濋櫓绠＄悊", Width: 1000, Height: 660 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx?keyid=" + keyid, Title: "杞﹁締淇℃伅", Width: 1000, Height: 660 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/business/CarManageAdd.aspx", Title: "鏂板杞﹁締", Width: 1000, Height: 660});
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/business/DeliverWorkBookfahuoqingkuang.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/business/DeliverWorkBookfahuoqingkuang.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+
+ <td class="ali03">
+ 鍙戣揣鏃堕棿锛�
+ </td>
+ <td>
+ <input id="txtBeginDate" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
+ </td>
+ <%-- <td class="ali03">
+ 瀛︽牎锛�
+ </td>
+ <td>
+ <input id='txtxuexiao' runat="server" maxlength='50' />
+ </td>
+
+ <td class="ali03 " style="padding-left: 20px">
+ 閫佽揣鐘舵�侊細
+ </td>
+ <td>
+ <select id="selstatus" keepdefaultstyle='true' runat="server" >
+ <option selected="selected" value="">鍏ㄩ儴</option>
+ <option value="0">鏈厤閫�</option>
+ <option value="1">閰嶉�佷腑</option>
+ <option value="2">宸查厤閫�</option>
+ </select>
+ </td>--%>
+
+
+ <td colspan="8">
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" runat="server" id="hideOrderId" />
+ </td>
+ </tr>
+ </table>
+ </div>
+
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="30" style="text-align: center" >
+ 缂栧彿
+ </th>
+ <th style="text-align: center" >
+ 鍙戣揣鏃ユ湡
+ </th>
+ <th style="text-align: center" >
+ 瀹㈡埛鍗曚綅
+ </th>
+ <%=biaotou %>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("createTime","{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("name")%>
+ </td>
+ <%#Eval("biaoge")%>
+
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ <tr>
+ <%=biaowei %>
+ </tr>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
new file mode 100644
index 0000000..1f93abb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.cs
@@ -0,0 +1,187 @@
+锘縰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;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //琛屾斂绠＄悊
+ public partial class DeliverWorkBookfahuoqingkuang : BasePage
+ {
+ CoreCmsPlanOrderBLL bll_CoreCmsPlanOrderBLL = null;
+ // CoreCmsPlanOrderItemBLL bll_CoreCmsPlanOrderItemBLL = null;
+ EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = null;
+ CoreCmsPlanOrderFahuoBLL bll_coreCmsPlanOrderFahuoBLL = null;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ public string biaotou = "";
+ public string biaowei = "";
+
+
+ //鍒濆鍖�
+ public DeliverWorkBookfahuoqingkuang()
+ {
+ bll_CoreCmsPlanOrderBLL = new CoreCmsPlanOrderBLL();
+ // bll_CoreCmsPlanOrderItemBLL = new CoreCmsPlanOrderItemBLL();
+ _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ bll_coreCmsPlanOrderFahuoBLL = new CoreCmsPlanOrderFahuoBLL();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+
+
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ string orderIdStr = Request["orderId"];
+ this.hideOrderId.Value = orderIdStr;
+
+ //var coreCmsPlanOrders = bll_CoreCmsPlanOrderBLL.GetModelByorderid(orderIdStr.ToInt32().Value);
+
+
+
+ var coreCmsPlanOrderFahuos = bll_coreCmsPlanOrderFahuoBLL.GetModelsByOrderid(orderIdStr.ToInt32().Value);
+ var BeginDate = this.txtBeginDate.Value.Trim();
+ if (!string.IsNullOrEmpty(BeginDate))
+ {
+ var sss = BeginDate.ToDateTime2().Value;
+ coreCmsPlanOrderFahuos = coreCmsPlanOrderFahuos.Where(x => x.createTime >= sss);
+ }
+ var EndDate = this.txtEndDate.Value.Trim();
+ if (!string.IsNullOrEmpty(EndDate))
+ {
+ var sss = EndDate.ToDateTime2().Value.AddDays(1);
+ coreCmsPlanOrderFahuos = coreCmsPlanOrderFahuos.Where(x => x.createTime <= sss);
+ }
+
+
+ var corname = "";
+
+ var eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderIdStr.ToInt32().Value);
+ if (eC_OrderBasic != null)
+ {
+ corname = eC_OrderBasic.BuyerName;
+ }
+
+
+
+
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderIdStr.ToInt32().Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+
+ }
+ var inquiryWorkBookModels = _inquiryCommonModel.InquiryWorkBookList.OrderBy(x=>x.WorkBookNameTxt).ThenBy(x=>x.WorkBookSizeTxt);
+
+ if (string.IsNullOrEmpty(biaotou))
+ {
+ string biaotou2 = " <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> ";
+ biaotou2+= " <th style=\"text-align:center\" > 宸插彂 </th> <th style=\"text-align:center\" > 鏈彂 </th> ";
+
+
+ }
+ 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 = coreCmsPlanOrderFahuos.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>";
+
+ }
+
+
+
+
+ var cmsPlanOrderFahuos = coreCmsPlanOrderFahuos.GroupBy(p => new { p.createTime.Value.Date }).Select(g => new CoreCmsPlanOrderFahuo
+ {
+ // 鍒嗙粍瀛楁
+ createTime = g.Key.Date,
+
+ }).OrderByDescending(x=>x.createTime).ToList();
+
+ foreach (var cmsPlanOrderFahuo in cmsPlanOrderFahuos)
+ {
+
+ cmsPlanOrderFahuo.name = corname;
+
+ var cmsPlanOrderFahuos1 = coreCmsPlanOrderFahuos.Where(x => x.createTime.Value.Date == cmsPlanOrderFahuo.createTime);
+ foreach (var inquiryWorkBookModel in inquiryWorkBookModels)
+ {
+ var nums = cmsPlanOrderFahuos1.Where(x => x.name == inquiryWorkBookModel.WorkBookNameTxt && x.specification == inquiryWorkBookModel.WorkBookSizeTxt).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>";
+
+ //if (cmsPlanOrderItem != null)
+ //{
+ // var coreDeliverOrderItems1 = coreDeliverOrderItems.Where(x =>x.PlanOrderId == coreCmsPlanOrder.id && x.ZYBName == inquiryWorkBookModel.WorkBookNameTxt && x.ZYBSpecification == inquiryWorkBookModel.WorkBookSizeTxt);
+
+ // var Number = coreDeliverOrderItems1.Sum(x => x.Number);
+ // var LessNumber = coreDeliverOrderItems1.Sum(x => x.LessNumber);
+
+
+ //}
+ //else
+ //{
+ // coreCmsPlanOrder.biaoge += " <td style=\"text-align:center\"> 0 </td> <td style=\"text-align:center\"> <span style=\"color:red;\" >0</span></td> ";
+ //}
+
+ }
+
+ }
+
+
+
+
+ this.RepClientList.DataSource = cmsPlanOrderFahuos;
+ this.RepClientList.DataBind();
+
+ }
+
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.designer.cs
new file mode 100644
index 0000000..1650f94
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverWorkBookfahuoqingkuang.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverWorkBookfahuoqingkuang
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <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;
+
+ /// <summary>
+ /// txtBeginDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginDate;
+
+ /// <summary>
+ /// txtEndDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
index d1868a9..cadbbed 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
@@ -461,8 +461,8 @@
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
index 74f191a..01475ec 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
@@ -222,12 +222,20 @@
</asp:Repeater>
<tr class="StatisticsMoney">
<td colspan="8" class="ali03">
- 鍚堣锛�
+ 褰撳墠椤电粺璁★細
</td>
<td colspan="5" class="ali01">
<span id="NowMoney" runat="server" ></span>
</td>
</tr>
+ <tr class="StatisticsMoney">
+ <td colspan="8" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td colspan="5" class="ali01">
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ </tr>
</table>
<div id="page">
<uc:UCPager ID="UCPager1" runat="server" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
index c8cc223..405b87d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
@@ -214,8 +214,8 @@
}
+ this.AllMoney.InnerText = pa.heji1.Value.ToString("0.00");
-
this.NowMoney.InnerText = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
this.RepClientList.DataSource = oA_WorkPlans;
this.RepClientList.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs
index cb2da52..66ed16d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs
@@ -123,6 +123,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowMoney;
/// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index dacabcf..1e8195e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -166,7 +166,26 @@
</td>
</tr>
</ItemTemplate>
+
<FooterTemplate>
+ <tr class="StatisticsMoney">
+ <td colspan="5" class="ali03">
+ 褰撳墠椤电粺璁★細
+ </td>
+ <td colspan="3" class="ali01">
+ <%-- <span id="NowMoney" runat="server" ></span>--%>
+ <%=NowMoney %>
+ </td>
+ </tr>
+ <tr class="StatisticsMoney">
+ <td colspan="5" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td colspan="3" class="ali01">
+ <%--<span id="AllMoney" runat="server" ></span>--%>
+ <%=AllMoney %>
+ </td>
+ </tr>
</table>
</FooterTemplate>
</asp:Repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
index 2279b79..29beb8a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs
@@ -18,6 +18,9 @@
{
Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ public string NowMoney = "";
+ public string AllMoney = "";
+
//鍒濆鍖�
public RequestReplyList()
@@ -44,7 +47,10 @@
DateTime? endTime = null;
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value),this.txtPlanPeople.Value.Trim(), this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null);
+ var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), this.txtPlanPeople.Value.Trim(), this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null);
+ AllMoney = pa.heji1.Value.ToString("0.00");
+ NowMoney = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
+ this.RepClientList.DataSource = oA_WorkPlans;
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
--
Gitblit v1.9.1