From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.cs | 115 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.designer.cs | 53 +
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs | 92 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx | 50 +
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.designer.cs | 35 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx | 524 ++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverunusualPrint.aspx.cs | 9
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs | 58 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx | 176 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.designer.cs | 107 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.cs | 292 ++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 57 +
18 files changed, 1,627 insertions(+), 20 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index c6d1a8a..84ff7ae 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -587,7 +587,7 @@
/// <returns></returns>
public IEnumerable<EC_OrderBasic> GetModelPageListForPrepayments(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
{
- string Condition = " and ( ob.[OrderState] ='2' or ob.[OrderState] ='3' and SellerId='"+ SellerId + "' )";
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' ) and SellerId='" + SellerId + "' ";
if (!string.IsNullOrEmpty(DeliveryTime))
{
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
index 6db6161..418b40b 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanBLL.cs
@@ -154,22 +154,73 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_DeliverPlan> SelectModelPage(Pagination pa, Guid FirmId, string DeliveredTime,
- string CarId, string DriverId,string trueMemberId ="")
+ string CarId, string DriverId,string trueMemberId ="", string CustormerName = "", string BusinessManager = "")
{
string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
-
+ string sort = " case when Sort is null then 1 else 0 end asc,Sort asc ";
if (!string.IsNullOrEmpty(DeliveredTime) )
{
if(DeliveredTime != "閫炬湡")
{
Condition += " and DATEDIFF(day,od.[DeliverTime],'" + DeliveredTime + "')=0 ";
+
}
else
{
- Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<=0 ";
+ Condition += " and DATEDIFF(day,GETDATE(),od.[DeliverTime])<0 and od.[DeliveredTime] is null ";
+ sort = " DeliverTime desc,Sort asc ";
}
}
+
+ if (!string.IsNullOrEmpty(CarId))
+ Condition += " and od.CarId = '" + CarId + "'";
+ if (!string.IsNullOrEmpty(DriverId))
+ Condition += " and od.DriverId = '" + DriverId + "'";
+ if (!string.IsNullOrEmpty(trueMemberId))
+ Condition += " and oss.MemberId = '" + trueMemberId + "'";
+ if (!string.IsNullOrEmpty(BusinessManager))
+ Condition += " and od.BusinessManagerId = '" + BusinessManager + "'";
+ if (!string.IsNullOrEmpty(CustormerName))
+ Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DeliverPlanDAL.SelectModelPage(query, pa);
+ }
+
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> SelectModelPageLishi(Pagination pa, Guid FirmId, string DeliveredTimestart, string DeliveredTimeend,
+ string CarId, string DriverId, string trueMemberId = "")
+ {
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 ";
+
+ if (!string.IsNullOrEmpty(DeliveredTimestart))
+ {
+
+ Condition += " and DATEDIFF(day,'"+ DeliveredTimestart + "',od.[DeliverTime])>=0 ";
+
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeend))
+ {
+
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeend + "',od.[DeliverTime])<=0 ";
+
+ }
+
if (!string.IsNullOrEmpty(CarId))
Condition += " and od.CarId = '" + CarId + "'";
@@ -190,6 +241,7 @@
}
+
/// <summary>
/// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
/// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index 3ec8a47..8e8a66c 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -162,8 +162,8 @@
new SqlParameter("@FirmId",trueModel.FirmId),
new SqlParameter("@BuyerId",trueModel.BuyerId),
DeliveredTime,
- new SqlParameter("@Zhuyishixiang",trueModel.Zhuyishixiang),
- new SqlParameter("@Gongzuokaoping",trueModel.Gongzuokaoping),
+ new SqlParameter("@Zhuyishixiang",string.IsNullOrEmpty(trueModel.Zhuyishixiang)?"":trueModel.Zhuyishixiang ),
+ new SqlParameter("@Gongzuokaoping",string.IsNullOrEmpty(trueModel.Gongzuokaoping)?"":trueModel.Gongzuokaoping ),
new SqlParameter("@CarId",trueModel.CarId),
new SqlParameter("@DriverId",trueModel.DriverId),
new SqlParameter("@Transferstatus",trueModel.Transferstatus),
@@ -174,15 +174,15 @@
new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime.HasValue?trueModel.LastUpdateTime.Value:DateTime.MinValue),
new SqlParameter("@Sort",trueModel.Sort),
new SqlParameter("@DeliverTime",trueModel.DeliverTime),
- new SqlParameter("@wentifankui",trueModel.wentifankui),
- new SqlParameter("@Yichangchuli",trueModel.Yichangchuli),
- new SqlParameter("@Xingzhengzhuize",trueModel.Xingzhengzhuize),
+ new SqlParameter("@wentifankui",string.IsNullOrEmpty(trueModel.wentifankui)?"":trueModel.wentifankui),
+ new SqlParameter("@Yichangchuli",string.IsNullOrEmpty(trueModel.Yichangchuli)?"":trueModel.Yichangchuli),
+ new SqlParameter("@Xingzhengzhuize",string.IsNullOrEmpty(trueModel.Xingzhengzhuize)?"":trueModel.Xingzhengzhuize),
new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
new SqlParameter("@Dianhua",trueModel.Dianhua),
new SqlParameter("@Dizhi",trueModel.Dizhi),
new SqlParameter("@Remark",trueModel.Remark),
new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
- new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
+ new SqlParameter("@Biddingcompany",trueModel.Biddingcompany.HasValue?trueModel.Biddingcompany.Value:0),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index cb2dfac..713ca6c 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1887,9 +1887,12 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\DeliverPlanFujianShow.aspx" />
+ <Content Include="Pages\business\DeliverPlanLishiList.aspx" />
<Content Include="Pages\business\DeliverPlanYijiao.aspx" />
<Content Include="Pages\business\DeliverPlanPaiche.aspx" />
<Content Include="Pages\business\DeliverPlanShifou.aspx" />
+ <Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
<Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
@@ -3347,6 +3350,20 @@
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanFujianShow.aspx.cs">
+ <DependentUpon>DeliverPlanFujianShow.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanFujianShow.aspx.designer.cs">
+ <DependentUpon>DeliverPlanFujianShow.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanLishiList.aspx.cs">
+ <DependentUpon>DeliverPlanLishiList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanLishiList.aspx.designer.cs">
+ <DependentUpon>DeliverPlanLishiList.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanYijiao.aspx.cs">
<DependentUpon>DeliverPlanYijiao.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3368,6 +3385,13 @@
<Compile Include="Pages\business\DeliverPlanShifou.aspx.designer.cs">
<DependentUpon>DeliverPlanShifou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanLishiPrint.aspx.cs">
+ <DependentUpon>DeliverPlanLishiPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanLishiPrint.aspx.designer.cs">
+ <DependentUpon>DeliverPlanLishiPrint.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.cs">
<DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx
new file mode 100644
index 0000000..058d925
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx
@@ -0,0 +1,50 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanFujianShow.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanFujianShow" %>
+
+<%-- 鍚堝悓娴忚椤甸潰銆備富瑕佹槸鐢ㄦ潵鎸夌収浠ユ祻瑙堟柟寮� --%>
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title></title>
+ <script src="./../../js/PictureShow/spotlight.bundle.js"></script>
+ <style type="text/css">
+
+ .textcenter{text-align:center}
+ .horizontal{
+ float:left;
+ border:1px solid black;
+ margin-left:20px;
+ }
+</style>
+</head>
+
+<form id="form1" runat="server">
+ <div class="textcenter">閫佽揣鍗曞浘鐗囬瑙�</div>
+
+
+<asp:Repeater id="RepClientList" runat="server">
+ <ItemTemplate>
+ <div class="textcenter horizontal" width="100" >
+ <a <%--class="spotlight"--%> title="鐐瑰嚮鏌ョ湅鍘熷浘" href="<%#Eval("FilePath").ToString() %>" target="view_window" >
+
+ <img src="<%#Eval("FilePath").ToString() %>" width="100" height="200" >
+
+
+ </a>
+ <p >绗�<%#Eval("PageCode")%>寮�</p>
+
+ </div>
+ </ItemTemplate>
+
+</asp:Repeater>
+
+
+</form>
+
+
+
+
+
+
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs
new file mode 100644
index 0000000..1145e72
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.cs
@@ -0,0 +1,92 @@
+锘縰sing CY.Infrastructure.Common;
+using CY.Infrastructure.Logging;
+using CY.Model.OA;
+using CY.SQLDAL;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using static CY.WebForm.MainPage;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanFujianShow : System.Web.UI.Page
+ {
+ /// <summary>
+ /// 鍚堝悓闄勪欢闆嗗悎
+ /// </summary>
+ List<OA_CorporateClientsContract> fileDataList { set; get; } = new List<OA_CorporateClientsContract>();
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ ReadList();
+ }
+
+
+ private void ReadList()
+ {
+
+ Guid Keyid = Request["Keyid"].ToGuid2();
+
+ if (Keyid == null)
+ {
+ JavaScript.MessageBox("鏈壘鍒拌瀹㈡埛", this, false, false);
+ return;
+ }
+ Database DC = new Database();
+ string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 order by [CreateTime] ", Keyid);
+ int count = 0;
+ try
+ {
+ SqlCommand myCmd = new SqlCommand(sqlStr, DC.Connection);
+ //SqlDataAdapter myDa = new SqlDataAdapter(myCmd);
+ var a = myCmd.ExecuteReader();
+ //myDa.Dispose();
+ fileDataList = new List<OA_CorporateClientsContract>();
+ OA_CorporateClientsContract Contract;
+ var i = 1;
+ while (a.Read())
+ { //娉ㄦ剰濡備綍灏嗘瘡娆¤鍙栧埌鐨勮褰曟坊鍔犲埌listbox1涓紙鍥犱负绗竴娆″仛鏃跺嚭閿欎簡锛屽樋鍢匡級
+ Contract = new OA_CorporateClientsContract();
+ // Contract.Keyid = a.GetInt32(0);
+ //Contract.CorporateClientsid = a.GetGuid(1);
+ //Contract.CorporateClientsName = a.GetString(4);
+ Contract.FileName = a[4].ToString();
+ Contract.PageCode = i;
+ Contract.FilePath = a.GetString(2);
+ // Contract.Remark = a.GetString(6);
+ i += 1;
+
+ fileDataList.Add(Contract);
+ }
+ a.Close(); //鍏抽棴sqldatareader
+ sqlStr = string.Format("select count(*) from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 ", Keyid);
+ myCmd = new SqlCommand(sqlStr, DC.Connection);
+ count = (int)myCmd.ExecuteScalar();
+
+
+ }
+ catch (Exception ee)
+ {
+ new Log4NetAdapter().Log("鏌ユ壘閫佽揣鍗曞浘鐗囧嚭閿欙細" + ee.Message);
+
+ }
+ finally
+ {
+ if (DC.Connection.State != System.Data.ConnectionState.Closed)
+ DC.Connection.Close();
+ }
+
+
+
+
+ this.RepClientList.DataSource = fileDataList;// fileDataList.AsEnumerable<OA_CorporateClientsContract>();
+
+ this.RepClientList.DataBind();
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.designer.cs
new file mode 100644
index 0000000..d6a9ea6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanFujianShow.aspx.designer.cs
@@ -0,0 +1,35 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanFujianShow
+ {
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx
new file mode 100644
index 0000000..5863a13
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx
@@ -0,0 +1,524 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanLishiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanLishiList" %>
+
+<!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 src="../../js/business/Order.js" type="text/javascript"></script>--%>
+ <script type="text/javascript">
+ //宸ヤ綔鑰冭瘎
+ function View(Keyid, BuyerId, DeliverTime,Sort) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanSort.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime + "&Sort=" + Sort, Title: "閫佽揣瀹夋帓鎺掑簭", Width: 300, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewZhuyishixiang(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanZhuyishixiang.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓娉ㄦ剰浜嬮」", Width: 800, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function ViewGongzuokaoping(Keyid, BuyerId, DeliverTime) {
+ //if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ // alert("璇峰厛瀹夋帓閫佽揣锛�");
+ // return;
+ //}
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanGongzuokaoping.aspx?Keyid=" + Keyid + "&BuyerId=" + BuyerId + "&DeliverTime=" + DeliverTime , Title: "閫佽揣瀹夋帓宸ヤ綔鑰冭瘎", Width: 800, Height: 300 });
+ }
+
+
+ //閫佽揣瀹夋帓
+ function ToAddorder() {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanEdit.aspx", Title: "鏂板閫佽揣鍗�", Width: 900, Height: 750 });
+ }
+
+ //閫佽揣瀹夋帓
+ function outAfterWorks(Keyid, BuyerId, DeliveredTime) {
+ top.Dialog.open({ URL: "/Pages/business/OrderProductionprogress.aspx?SellerOrderId=" + SellerOrderId + "&Keyid=" + Keyid + "&works=" + works, Title: works, Width: 300, Height: 300 });
+ }
+ //鎵撳嵃
+ function outAfterWorks(Keyid) {
+ if (Keyid == '00000000-0000-0000-0000-000000000000') {
+ alert("璇峰厛瀹夋帓閫佽揣锛�");
+ return;
+ }
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPrint.aspx?Keyid=" + Keyid + "&DelayTime=2021-04-09", Title: "宸ヤ綔鑰冭瘎", Width: 1000, Height: 800 });
+ }
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept1() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭绉讳氦鍗曟嵁鍚�?') ;
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll(ids, DeliverTime, BuyerId);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll = function (orderIds, DeliverTime, BuyerId) {
+ CallServer({ Target: "AcceptOrderAll", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '绉讳氦鍗曟嵁澶辫触锛�' : '绉讳氦鍗曟嵁澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept3() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanPaiche.aspx?ids=" + ids, Title: "瀹夋帓杞﹁締", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept4() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ //var carid = $("#selCarIddo").val();
+ //var driverid = $("#selDriverIddo").val();
+
+ //if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ //if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ //DeliverTime = DeliverTime.substring(1);
+ //BuyerId = BuyerId.substring(1);
+ }
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + ids, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+ }
+
+
+
+
+ ///鎵归噺鍙楃悊
+ function ToAllAccept2() {
+
+ var ids = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+ var isCan = true;
+ var DeliverTime = '';
+ var BuyerId = '';
+
+ var carid = $("#selCarIddo").val();
+ var driverid = $("#selDriverIddo").val();
+
+ if (carid == "") { alertMsg('璇烽�夋嫨杞﹁締锛�'); return; } else { }
+ if (driverid == "") { alertMsg('璇烽�夋嫨椹鹃┒鍛橈紒'); return; } else { }
+
+ cks.each(
+ function () {
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+
+ ids = ids + ',' + ckValJson.id;
+ //orderShowIds = orderShowIds + ',' + ckValJson.ordershowId;
+
+ DeliverTime = DeliverTime + ',' + ckValJson.DeliverTime;
+ BuyerId = BuyerId + ',' + ckValJson.BuyerId;
+ }
+ );
+
+
+ if (!isCan) {
+ // alertMsg('璇烽�夋嫨鏈彈鐞嗙殑璁㈠崟锛�');
+ }
+ else {
+ if (ids != '') {
+ ids = ids.substring(1);
+ DeliverTime = DeliverTime.substring(1);
+ BuyerId = BuyerId.substring(1);
+ }
+
+ var msg = ('纭娲捐溅鍚�?');
+ top.Dialog.confirm(msg, function () {
+ DoAcceptAll2(ids, DeliverTime, BuyerId, carid, driverid);
+ });
+ }
+ }
+
+ /*
+鎵归噺澶勭悊鍙楃悊璁㈠崟
+*/
+ var DoAcceptAll2 = function (orderIds, DeliverTime, BuyerId, carid, driverid) {
+ CallServer({ Target: "AcceptOrderAll2", ids: orderIds, DeliverTimes: DeliverTime, BuyerIds: BuyerId, Carid: carid, Driverid: driverid}, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '娲捐溅澶辫触锛�' : '娲捐溅澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ }
+
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintDriverorder(DriverId) {
+
+ OpenWindowByUrl('/Pages/business/DeliverOrderPrint.aspx?deliverorderId=' + DriverId, '', '');
+ }
+
+
+
+
+ //缁存姢
+ function onViewuplod(keyid) {
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ var DeliverTimestart = $("#txtDeliverTimestart").val();
+ var DeliverTimeend = $("#txtDeliverTimeend").val();
+ var CarId = $("#selCarId").val();
+ var DriverId = $("#selDriverId").val();
+ // OpenWindowByUrl();
+ //OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+ OpenWindowByUrl('/Pages/business/DeliverPlanLishiPrint.aspx?DeliverTimestart=' + DeliverTimestart + '&DeliverTimeend=' + DeliverTimeend + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+ }
+ </script>
+ <style type="text/css">
+ .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
+ .tableStyleXS td { padding: 1px 0 1px 3px; }
+ .TableNewStyle select { width: 80px; }
+ .td_hide span { text-decoration: default; display: none; text-align: center; }
+ span.hand_no { cursor: default; display: block; font-size: 12px; }
+ span.hand_no:hover { text-decoration: none; }
+ span.hand_yes { cursor: pointer; display: block; font-size: 12px; }
+ .td_hide { cursor: pointer; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent" style="width: auto;">
+ <div class="box1">
+ <table class="TableNewStyle" style="width: 100%;">
+ <tr>
+
+
+
+
+
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td> <td style="width:5%" >
+
+ </td>
+ <td style="width:15%">
+
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 閫佽揣鏃堕棿锛�
+ </td>
+ <td >
+ <input id="txtDeliverTimestart" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtDeliverTimeend" type="text" runat="server" class='date w80px' maxlength='10' />
+ </td>
+ <td class="ali03">
+ 杞﹁締锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selCarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03" >
+ 椹鹃┒鍛橈細
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+
+
+
+ <td colspan="6">
+
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+
+ <input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />
+
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+
+
+ <div clear="fl">
+ <table class="tableStyle tableStyleXS" useclick="false" usecheckbox="true" sortmode="false">
+ <thead>
+ <tr>
+ <th width="25">
+ </th>
+ <th width="25">
+ 椤哄簭
+ </th>
+ <th style="text-align: center;" width="70">
+ 閫佽揣鍗曞彿
+ </th>
+ <th style="text-align: center;" width="70">
+ 瑕佹眰鍒拌揪鏃堕棿
+ </th>
+ <th style="text-align: center;"width="100">
+ 瀹為檯鍒拌揪鏃堕棿
+ </th>
+ <th width="70">
+ 涓氬姟缁忕悊
+ </th>
+ <th width="100">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th style="text-align: center;"width="200">
+ 瀹㈡埛鍦板潃銆佽仈绯讳汉鍙婅仈绯荤數璇�
+ </th>
+
+
+ <th width="60">
+ 璐у崟鏁伴噺
+ </th>
+ <th width="60">
+ 杞﹁締
+ </th>
+ <th width="60">
+ 椹鹃┒鍛�
+ </th>
+ <th width="200">
+ 闂鍙嶉
+ </th>
+ <th width="200">
+ 娉ㄦ剰浜嬮」
+ </th>
+ <th width="200">
+ 宸ヤ綔鑰冭瘎
+ </th>
+ <th width="60">
+ 绉讳氦鐘舵��
+ </th>
+ <th width="60">
+ 鎵撳嵃閫佽揣鍗�
+ </th>
+ <th width="60">
+ 閫佽揣鍗曞浘鐗�
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <asp:repeater id="RepClientList" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:'<%#Eval("Keyid")%>',
+ DeliverTime: '<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>',
+ BuyerId:'<%#Eval("BuyerId")%>',
+ CarId:'<%#Eval("CarId")%>',
+ DriverId:'<%#Eval("DriverId")%>',
+ }" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
+ </td>
+
+ <td>
+ <%#Eval("Sort")%>
+ </td>
+ <td>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("BuyerName")%>
+ </td>
+
+ <td>
+ <%#Eval("DizhiLianxirenDianhua")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+ <td>
+ <%#Eval("wentifankui") %>
+ </td>
+ <td>
+ <%#Eval("Zhuyishixiang") %>
+ </td>
+ <td>
+ <%#Eval("Gongzuokaoping")%>
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
+ </td>
+ <td>
+ <a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'> 閫佽揣鍗曞浘鐗� </a>
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.cs
new file mode 100644
index 0000000..da64b03
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.cs
@@ -0,0 +1,292 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.OA;
+using CY.BLL.EC;
+using CY.BLL.Inquiry;
+using CY.Model.Inquiry;
+using System.Drawing;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanLishiList : BasePage
+ {
+
+ OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverPlanLishiList()
+ {
+
+ _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+
+
+
+ switch (Request["Target"])
+ {
+
+ case "AcceptOrderAll":
+ AcceptAll();
+ break;
+ case "AcceptOrderAll2":
+ AcceptAll2();
+ break;
+ default:
+ InitialSelectData();
+ BindList();
+ return;
+ }
+ Response.End();
+ }
+ }
+
+
+ //鍔犺浇鏌ヨ鏉′欢
+ protected void InitialSelectData()
+ {
+ this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ this.selDriverId.DataTextField = "Name";
+ this.selDriverId.DataValueField = "Keyid";
+ this.selDriverId.DataBind();
+ this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ this.selCarId.DataTextField = "CarNumber";
+ this.selCarId.DataValueField = "Keyid";
+ this.selCarId.DataBind();
+ this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ this.txtDeliverTimestart.Value = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+ this.txtDeliverTimeend.Value = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ BindList();
+ }
+
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+ //EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();
+ //Pagination pa1 = new Pagination();
+ //pa1.PageSize = 1000;
+ //pa1.PageIndex = 1;
+ //IEnumerable<OA_DeliverPlan> oA_DeliverPlans1 = eC_OrderBLL.GetshoukuantixingList(pa1,CurrentUser.MemberId, "", "", "", "", "", "", "");
+
+
+
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPageLishi(pa,
+ CurrentUser.MemberId,
+ this.txtDeliverTimestart.Value,
+ this.txtDeliverTimeend.Value,
+ this.selCarId.Value,
+ this.selDriverId.Value
+ );
+
+
+
+
+ this.RepClientList.DataSource = oA_DeliverPlans;
+
+
+
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ /// <summary>
+ /// 鎵归噺鍙楃悊璁㈠崟
+ /// </summary>
+ public void AcceptAll()
+ {
+ Response.Clear();
+
+ string ids = string.Empty;
+ string DeliverTimes = string.Empty;
+ string BuyerIds = string.Empty;
+ if (Request["ids"] != null)
+ {
+ ids = Request["ids"].ToString();
+ }
+ if (Request["DeliverTimes"] != null)
+ {
+ DeliverTimes = Request["DeliverTimes"].ToString();
+ }
+ if (Request["BuyerIds"] != null)
+ {
+ BuyerIds = Request["BuyerIds"].ToString();
+ }
+
+ string[] idsArray = ids.Split(',');
+ string[] DeliverTimesArray = DeliverTimes.Split(',');
+ string[] BuyerIdsArray = BuyerIds.Split(',');
+
+ if(idsArray!=null&& idsArray.Length > 0)
+ {
+ for(int i = 0; i < idsArray.Length; i++)
+ {
+ bool result = true;
+
+ OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
+ if (oA_DeliverPlan == null)
+ {
+ oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
+ oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = 0;
+ oA_DeliverPlan.DriverId = 0;
+ oA_DeliverPlan.Transferstatus = 2;
+ oA_DeliverPlan.TransfersTime = DateTime.Now;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ result = _OA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.Transferstatus = 2;
+ oA_DeliverPlan.TransfersTime = DateTime.Now;
+ result = _OA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
+ }
+ if (!result)
+ {
+ //BindList();
+ Response.Write("-2");
+ return;
+ }
+ }
+ }
+ // BindList();
+ Response.Write("1");
+
+
+
+ }
+
+
+ /// <summary>
+ /// 鎵归噺娲捐溅
+ /// </summary>
+ public void AcceptAll2()
+ {
+ Response.Clear();
+ int? carid = Request["CarId"].ToInt32(); //this.CarId.Value.ToGuid2();
+ int? driverId = Request["DriverId"].ToInt32(); //this.DriverId.Value.ToGuid2();
+ string ids = string.Empty;
+ string DeliverTimes = string.Empty;
+ string BuyerIds = string.Empty;
+ if (Request["ids"] != null)
+ {
+ ids = Request["ids"].ToString();
+ }
+ if (Request["DeliverTimes"] != null)
+ {
+ DeliverTimes = Request["DeliverTimes"].ToString();
+ }
+ if (Request["BuyerIds"] != null)
+ {
+ BuyerIds = Request["BuyerIds"].ToString();
+ }
+
+ string[] idsArray = ids.Split(',');
+ string[] DeliverTimesArray = DeliverTimes.Split(',');
+ string[] BuyerIdsArray = BuyerIds.Split(',');
+
+ if (idsArray != null && idsArray.Length > 0)
+ {
+ for (int i = 0; i < idsArray.Length; i++)
+ {
+ bool result = true;
+
+ OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(idsArray[i].ToGuid2(), BuyerIdsArray[i].ToGuid2(), DeliverTimesArray[i].ToDateTime2());
+ if (oA_DeliverPlan == null)
+ {
+ oA_DeliverPlan = new OA_DeliverPlan();
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.DeliverTime = DeliverTimesArray[i].ToDateTime2();
+ oA_DeliverPlan.BuyerId = BuyerIdsArray[i].ToGuid2();
+ oA_DeliverPlan.DeliveredTime = null;
+ oA_DeliverPlan.Zhuyishixiang = "";
+ oA_DeliverPlan.Gongzuokaoping = "";
+ oA_DeliverPlan.CarId = carid;
+ oA_DeliverPlan.DriverId = driverId;
+ oA_DeliverPlan.Transferstatus = 1;
+ oA_DeliverPlan.TransfersTime = null;
+ oA_DeliverPlan.Sort = 1;
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ oA_DeliverPlan.wentifankui = "";
+ result = _OA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.CarId = carid;
+ oA_DeliverPlan.DriverId = driverId;
+ result = _OA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
+ }
+ if (!result)
+ {
+ // BindList();
+ Response.Write("-2");
+ return;
+ }
+ }
+ }
+ //BindList();
+ Response.Write("1");
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.designer.cs
new file mode 100644
index 0000000..3918334
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiList.aspx.designer.cs
@@ -0,0 +1,107 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanLishiList
+ {
+
+ /// <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>
+ /// txtDeliverTimestart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliverTimestart;
+
+ /// <summary>
+ /// txtDeliverTimeend 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliverTimeend;
+
+ /// <summary>
+ /// selCarId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCarId;
+
+ /// <summary>
+ /// selDriverId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
+
+ /// <summary>
+ /// btn_Search 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Search;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx
new file mode 100644
index 0000000..cd90ce2
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx
@@ -0,0 +1,176 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanLishiPrint.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanLishiPrint" %>
+
+<!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>
+ <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+ <script src="../../js/common/util.js" type="text/javascript"></script>
+ <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+ <script src="../../js/common/Printter.js?v=14" type="text/javascript"></script>
+ <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰start-->
+ <style type="text/css">
+ .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+ .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+ .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid;}
+ .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
+ .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+ .dbody table td { border-left: 0; padding-left:2px; }
+ .left {text-align: right; }
+ #div_tool { text-align: center; }
+ </style>
+ <script type="text/javascript">
+ window.printBeginCallBack = function () {
+ document.getElementById('fram_operate').style.display = 'none';
+ };
+ window.printOverCallBack = function () {
+ document.getElementById('fram_operate').style.display = '';
+ };
+
+ $(function () {
+ $("#btnPrint").click(function () {
+ var orderId = $("#hideOrderId").val();
+ $.ajax({
+ url: '/Pages/business/OrderProdactionPrintBiaoqian.aspx?tmp' + (new Date()).valueOf(),
+ type: "POST",
+ async: false,
+ data: "Target=print&orderIdStr=" + orderId,
+ success: function (dataStr) {
+
+ }
+ });
+ });
+ });
+ </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+ <form id="form1" runat="server">
+ <input type="hidden" runat="server" id="hideOrderId" />
+ <div class='dbody'>
+ <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+ </object>
+ <div id='div_tool' >
+ </div>
+
+
+
+
+
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
+ <thead>
+ <tr>
+ <th width="25">
+ 椤哄簭
+ </th>
+ <th style="text-align: center;" width="70">
+ 閫佽揣鍗曞彿
+ </th>
+ <th style="text-align: center;" width="70">
+ 瑕佹眰鍒拌揪鏃堕棿
+ </th>
+ <th style="text-align: center;"width="100">
+ 瀹為檯鍒拌揪鏃堕棿
+ </th>
+ <th width="70">
+ 涓氬姟缁忕悊
+ </th>
+ <th width="100">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th style="text-align: center;"width="200">
+ 瀹㈡埛鍦板潃銆佽仈绯讳汉鍙婅仈绯荤數璇�
+ </th>
+
+
+ <th width="60">
+ 璐у崟鏁伴噺
+ </th>
+ <th width="60">
+ 杞﹁締
+ </th>
+ <th width="60">
+ 椹鹃┒鍛�
+ </th>
+ <th width="200">
+ 闂鍙嶉
+ </th>
+ <th width="200">
+ 娉ㄦ剰浜嬮」
+ </th>
+ <th width="200">
+ 宸ヤ綔鑰冭瘎
+ </th>
+ <th width="60">
+ 绉讳氦鐘舵��
+ </th>
+
+
+ </tr>
+ </thead>
+ <tbody>
+ <asp:Repeater runat="server" ID='rptOrder'>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <%#Eval("Sort")%>
+ </td>
+ <td>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("BusinessManager")%>
+ </td>
+ <td>
+ <%#Eval("BuyerName")%>
+ </td>
+
+ <td>
+ <%#Eval("DizhiLianxirenDianhua")%>
+ </td>
+ <td>
+ <%#Eval("shuliang")%>
+ </td>
+ <td>
+ <%#Eval("CarName")%>
+ </td>
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+ <td>
+ <%#Eval("wentifankui") %>
+ </td>
+ <td>
+ <%#Eval("Zhuyishixiang") %>
+ </td>
+ <td>
+ <%#Eval("Gongzuokaoping")%>
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
+ </td>
+
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ </tbody>
+ </table>
+
+
+
+
+
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.cs
new file mode 100644
index 0000000..df3010f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.cs
@@ -0,0 +1,115 @@
+锘�/**
+* OrderDeatil.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟璇︽儏
+* 绫� 鍚嶏細 OrderDeatil
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-24 13:25 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-15 18:23 鍚村磶鍧� 缂栬緫鐣岄潰鏍峰紡
+* V0.03 2013-5-15 15:58 鍚村磶鍧� 瀹屾垚鏁版嵁鑾峰彇
+* V0.04 2013-5-21 14:38 鍚村磶鍧� 澧炲姞璁㈠崟杩涘害
+* V0.05 2013-5-23 9:33 鍚村磶鍧� 淇敼缁ф壙绫讳负榛樿绫籔age浣挎樉绀轰俊鎭笉鍙楃櫥褰曟帶鍒�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanLishiPrint : BasePage
+ {
+
+ OA_DeliverPlanBLL _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ public static string SellerOrderId = "";
+ public static string PrintType = "";
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ break;
+ case "print":
+ break;
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+ /// <summary>
+ /// 榛樿鍔犺浇浜嬩欢鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+ LoadOrderInfo();
+ }
+
+ /// <summary>
+ /// 鍔犺浇璁㈠崟淇℃伅
+ /// </summary>
+ private bool LoadOrderInfo()
+ {
+ string DeliverTimestart = Request["DeliverTimestart"];
+ string DeliverTimeend = Request["DeliverTimeend"];
+
+ string CarId = Request["CarId"];
+ string DriverId = Request["DriverId"];
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = 1000;
+ pa.PageIndex = 1;
+
+ IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPageLishi(pa,
+ CurrentUser.MemberId,
+ DeliverTimestart,
+ DeliverTimeend,
+ CarId,
+ DriverId
+ );
+
+
+
+
+ rptOrder.DataSource = oA_DeliverPlans;
+ rptOrder.DataBind();
+
+ return true;
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.designer.cs
new file mode 100644
index 0000000..0032f07
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanLishiPrint.aspx.designer.cs
@@ -0,0 +1,53 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanLishiPrint
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// rptOrder 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptOrder;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 48b42b0..0f3af0c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -284,6 +284,16 @@
}
+
+
+ //缁存姢
+ function onViewuplod(keyid) {
+ var l = (screen.availWidth - 500) / 2;
+ var t = (screen.availHeight - 300) / 2;
+ // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+ window.open('/Pages/business/DeliverPlanFujianShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
/*
鎵撳嵃閫佽揣鍗�
*/
@@ -291,8 +301,11 @@
var DeliveryTime = $("#txtDeliveryTime").val();
var CarId = $("#selCarId").val();
var DriverId = $("#selDriverId").val();
+ var CustormerName = $("#txtCustormerName").val();
+ var BusinessManager = $("#selBusinessManager").val();
+
// OpenWindowByUrl();
- OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId, '', '');
+ OpenWindowByUrl('/Pages/business/DeliverPlanPrint.aspx?DeliverTime=' + DeliveryTime + '&CarId=' + CarId + '&DriverId=' + DriverId + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
}
</script>
<style type="text/css">
@@ -336,14 +349,22 @@
</td> <td style="width:5%" >
</td>
- <td style="width:15%">
+ <td style="width:10%">
</td> <td style="width:5%" >
</td>
- <td style="width:15%">
+ <td style="width:10%">
</td>
+ <td style="width:5%" >
+
+ </td>
+ <td style="width:10%">
+
+ </td>
+
+
</tr>
<tr>
<td class="ali03">
@@ -374,6 +395,14 @@
<select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>
+
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+
</tr>
<tr>
@@ -392,7 +421,13 @@
<select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>--%>
-
+ <td class="ali03">
+ 涓氬姟缁忕悊锛�
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
<td colspan="9">
<asp:button id="btn_Search" text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
@@ -484,6 +519,9 @@
椹鹃┒鍛�
</th>
<th width="200">
+ 闂鍙嶉
+ </th>
+ <th width="200">
娉ㄦ剰浜嬮」
</th>
<th width="200">
@@ -494,6 +532,9 @@
</th>
<th width="60">
鎵撳嵃閫佽揣鍗�
+ </th>
+ <th width="60">
+ 閫佽揣鍗曞浘鐗�
</th>
</tr>
</thead>
@@ -527,7 +568,7 @@
<%#Eval("BusinessManager")%>
</td>
<td>
- <%#Eval("BuyerName")%>
+ <%#Eval("CompanyName")%>
</td>
<td>
@@ -543,6 +584,9 @@
<%#Eval("DriverName")%>
</td>
<td>
+ <%#Eval("wentifankui")%>
+ </td>
+ <td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Zhuyishixiang").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Zhuyishixiang")%> </a>
</td>
<td>
@@ -554,6 +598,9 @@
<td>
<a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
</td>
+ <td>
+ <a href='javascript:void(0)' title='閫佽揣鍗曞浘鐗�' class='a_under' onclick='onViewuplod("<%#Eval("Keyid")%>")'> 閫佽揣鍗曞浘鐗� </a>
+ </td>
</tr>
</itemtemplate>
</asp:repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index f4e3645..85f920b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -79,6 +79,13 @@
this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
//this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
//this.selDriverIddo.DataTextField = "Name";
//this.selDriverIddo.DataValueField = "Keyid";
@@ -296,7 +303,10 @@
CurrentUser.MemberId,
this.txtDeliveryTime.Value,
this.selCarId.Value,
- this.selDriverId.Value
+ this.selDriverId.Value,
+ "",
+ this.txtCustormerName.Value.Trim(),
+ this.selBusinessManager.Value
);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
index 1004a35..741aacc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
@@ -141,6 +141,24 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
/// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
index ca8c5d0..2c5d8a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPrint.aspx.cs
@@ -60,11 +60,18 @@
string DeliverTime = Request["DeliverTime"].ToString2();
+ string CustormerName = Request["CustormerName"].ToString2();
+
+ string BusinessManager = Request["BusinessManager"].ToString2();
+
IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPage(pa,
CurrentUser.MemberId,
DeliverTime,
CarId,
- DriverId
+ DriverId,
+ "",
+ CustormerName,
+ BusinessManager
);
@@ -87,7 +94,7 @@
- ssshtml += "<tr><td>"+oA_DeliverPlans1[i].Sort+"</td><td>"+ oA_DeliverPlans1[i].DeliverTime.Value.ToString("yyyy-MM-dd")+"</td><td>"+ oA_DeliverPlans1[i].BusinessManager +"</td><td>"+ oA_DeliverPlans1[i].BuyerName +"</td><td>"+ oA_DeliverPlans1[i].DizhiLianxirenDianhua +"</td><td>"+ oA_DeliverPlans1[i].shuliang +"</td><td>"+ oA_DeliverPlans1[i].CarName+" </td><td>"+ oA_DeliverPlans1[i].DriverName +"</td><td>"+ oA_DeliverPlans1[i].Zhuyishixiang +"</td></tr>";
+ ssshtml += "<tr><td>"+oA_DeliverPlans1[i].Sort+"</td><td>"+ oA_DeliverPlans1[i].DeliverTime.Value.ToString("yyyy-MM-dd")+"</td><td>"+ oA_DeliverPlans1[i].BusinessManager +"</td><td>"+ oA_DeliverPlans1[i].CompanyName + "</td><td>"+ oA_DeliverPlans1[i].DizhiLianxirenDianhua +"</td><td>"+ oA_DeliverPlans1[i].shuliang +"</td><td>"+ oA_DeliverPlans1[i].CarName+" </td><td>"+ oA_DeliverPlans1[i].DriverName +"</td><td>"+ oA_DeliverPlans1[i].Zhuyishixiang +"</td></tr>";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverunusualPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverunusualPrint.aspx.cs
index b0d0b71..dc7a267 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverunusualPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverunusualPrint.aspx.cs
@@ -85,15 +85,20 @@
string DeliverTimestart = Request["DeliverTimestart"];
string DeliverTimeend = Request["DeliverTimeend"];
+ string CarId = Request["CarId"];
+ string DriverId = Request["DriverId"];
+
Pagination pa = new Pagination();
pa.PageSize = 1000;
pa.PageIndex = 1;
- IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPageunusual(pa,
+ IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanBLL.SelectModelPageLishi(pa,
CurrentUser.MemberId,
DeliverTimestart,
- DeliverTimeend
+ DeliverTimeend,
+ CarId,
+ DriverId
);
--
Gitblit v1.9.1