From 66beb245e516809514642c00922f0339bf760518 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 09 五月 2025 08:38:00 +0800
Subject: [PATCH] 菜单 行政管理=》行政管理=》问题反馈 /Pages/business/DeliverPlanPaicheList.aspx 06
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs | 81 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx | 184 +++++
CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.designer.cs | 80 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs | 10
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 100 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.designer.cs | 134 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs | 289 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx | 582 ++++++++++++++++++
CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs | 63 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs | 274 ++++++++
12 files changed, 1,818 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
index bd02330..b73566c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_DeliverPlanPaicheBLL.cs
@@ -238,9 +238,68 @@
-
-
+
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_DeliverPlan> SelectModelPageWenti(Pagination pa, Guid FirmId,
+ string DeliveredTimeStart, string DeliveredTimeEnd, string DriverId, string Zerenren , string CustormerName , string Wanjiestatus )
+ {
+ string Condition = " and od.FirmId ='" + FirmId + "' and od.shifouDelivery = 1 and od.DeliveredTime is not null and od.wentifankui is not null and od.wentifankui!='' ";
+ string sort = "DeliveredTime desc ";
+
+
+ if (!string.IsNullOrEmpty(DeliveredTimeStart))
+ {
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeStart + "',od.[DeliveredTime]) >= 0 ";
+ }
+
+ if (!string.IsNullOrEmpty(DeliveredTimeEnd))
+ {
+ Condition += " and DATEDIFF(day,'" + DeliveredTimeEnd + "',od.[DeliveredTime]) <= 0 ";
+ }
+
+ if (!string.IsNullOrEmpty(DriverId))
+ Condition += " and od.DriverId = '" + DriverId + "'";
+
+ if (!string.IsNullOrEmpty(Zerenren))
+ Condition += " and od.Zerenren = '" + Zerenren + "'";
+ if (!string.IsNullOrEmpty(CustormerName))
+ Condition += " and od.CompanyName like '%" + CustormerName + "%'";
+
+
+
+
+ if (!string.IsNullOrEmpty(Wanjiestatus))
+ {
+ if (Wanjiestatus == "1")
+ {
+ Condition += " and od.Wanjiestatus = 1 ";
+ }
+ else
+ {
+ Condition += " and ( od.Wanjiestatus is null or od.Wanjiestatus = 0 )";
+ }
+
+ }
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy",sort)
+ };
+ query.Criteria = criterias;
+ return _IOA_DeliverPlanPaicheDAL.SelectModelPageWenti(query, pa);
+ }
+
+
}
}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs
index 419a896..44c0a89 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_DeliverPlanPaicheDAL.cs
@@ -6,6 +6,7 @@
using System.Data.SqlClient;
using CY.IBaseDAL;
using CY.Model;
+using CY.Infrastructure.Query;
namespace CY.IDAL
{
@@ -36,5 +37,15 @@
/// <returns></returns>
IEnumerable<Model.OA_DeliverPlan> GetModelByDeliveredTime(Guid FirmId, DateTime DeliverTime);
+
+
+ /// <summary>
+ /// 鍙栧緱鍒嗛〉鏁版嵁
+ /// </summary>
+ /// <param name="query">鏌ヨ鏉′欢</param>
+ /// <param name="pagination">鍒嗛〉鏉′欢</param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_DeliverPlan> SelectModelPageWenti(Query query, Pagination pagination);
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 9700251..110e764 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -445,6 +445,63 @@
set;
}
+ public int? Wanjiestatus
+ {
+ get;
+ set;
+ }
+ public string WanjiestatusName
+ {
+ get
+ {
+ return Wanjiestatus.HasValue&& Wanjiestatus.Value==1 ? "鈭�" : "脳";
+ }
+
+ }
+
+ public DateTime? WanjieTime
+ {
+ get;
+ set;
+ }
+
+ public string Wanjieren
+ {
+ get;
+ set;
+ }
+
+ public int? Zerenren
+ {
+ get;
+ set;
+ }
+
+ public string ZerenrenName
+ {
+ get;
+ set;
+ }
+
+ public decimal? Fakuan
+ {
+ get;
+ set;
+ }
+
+
+ public DateTime? ZerenTime
+ {
+ get;
+ set;
+ }
+
+ public string Zerenoperater
+ {
+ get;
+ set;
+ }
+
#endregion Model
#region Visiter
@@ -786,7 +843,48 @@
this.DeliverPlanPaicheid = isChange ? MyConvert.ConvertToGuid(value) : DeliverPlanPaicheid;
theValue = this.DeliverPlanPaicheid;
}
-
+
+ else if ("Wanjiestatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 63)
+ {
+ this.Wanjiestatus = isChange ? MyConvert.ConvertToInt32(value) : Wanjiestatus;
+ theValue = this.Wanjiestatus;
+ }
+ else if ("WanjieTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 64)
+ {
+ this.WanjieTime = isChange ? MyConvert.ConvertToDateTime(value) : WanjieTime;
+ theValue = this.WanjieTime;
+ }
+ else if ("Wanjieren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 65)
+ {
+ this.Wanjieren = isChange ? MyConvert.ConvertToString(value) : Wanjieren;
+ theValue = this.Wanjieren;
+ }
+ else if ("Zerenren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 66)
+ {
+ this.Zerenren = isChange ? MyConvert.ConvertToInt32(value) : Zerenren;
+ theValue = this.Zerenren;
+ }
+ else if ("ZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 67)
+ {
+ this.ZerenrenName = isChange ? MyConvert.ConvertToString(value) : ZerenrenName;
+ theValue = this.ZerenrenName;
+ }
+ else if ("Fakuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 68)
+ {
+ this.Fakuan = isChange ? MyConvert.ConvertToDecimal(value) : Fakuan;
+ theValue = this.Fakuan;
+ }
+ else if ("ZerenTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 69)
+ {
+ this.ZerenTime = isChange ? MyConvert.ConvertToDateTime(value) : ZerenTime;
+ theValue = this.ZerenTime;
+ }
+ else if ("Zerenoperater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 70)
+ {
+ this.Zerenoperater = isChange ? MyConvert.ConvertToString(value) : Zerenoperater;
+ theValue = this.Zerenoperater;
+ }
+
return theValue;
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
index 4f0a1a3..fab239d 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
@@ -39,6 +39,28 @@
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
const string ORDERBY = " case when Sort is null then 1 else 0 end asc,Sort asc ";
+
+
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET1 = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE1 = " ( select od.*, " +
+ " oss.Name as DriverName, os.Name as ZerenrenName " +
+ " from [OA_DeliverPlanPaiche] od " +
+ " left join [OA_Staff] os on od.Zerenren = os.Keyid " +
+ " left join [OA_Staff] oss on od.[DriverId] = oss.Keyid " +
+
+ " where 0=0 ";
+ const string FROMSOUCEEND1 = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY1 = " DeliveredTime desc ";
+
#endregion
public OA_DeliverPlanPaicheDAL()
{
@@ -167,6 +189,25 @@
LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
}
+ SqlParameter WanjieTime = null;
+ if (trueModel.WanjieTime.HasValue)
+ {
+ WanjieTime = new SqlParameter("@WanjieTime", trueModel.WanjieTime.Value);
+ }
+ else
+ {
+ WanjieTime = new SqlParameter("@WanjieTime", DBNull.Value);
+ }
+ SqlParameter ZerenTime = null;
+ if (trueModel.ZerenTime.HasValue)
+ {
+ ZerenTime = new SqlParameter("@ZerenTime", trueModel.ZerenTime.Value);
+ }
+ else
+ {
+ ZerenTime = new SqlParameter("@ZerenTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -202,8 +243,18 @@
new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+ new SqlParameter("@Wanjiestatus",trueModel.Wanjiestatus.HasValue?trueModel.Wanjiestatus.Value:0),
+ WanjieTime,
+ new SqlParameter("@Wanjieren",string.IsNullOrEmpty(trueModel.Wanjieren)?"":trueModel.Wanjieren),
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0),
+ new SqlParameter("@Fakuan",trueModel.Fakuan.HasValue?trueModel.Fakuan.Value:0),
+ ZerenTime,
+ new SqlParameter("@Zerenoperater",string.IsNullOrEmpty(trueModel.Zerenoperater)?"":trueModel.Zerenoperater),
+
+
+
};
- string sql = "Update OA_DeliverPlanPaiche Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[DeliveredTime]=@DeliveredTime,[Zhuyishixiang]=@Zhuyishixiang,Gongzuokaoping=@Gongzuokaoping, [CarId]=@CarId, [DriverId]=@DriverId,[Transferstatus]=@Transferstatus, [TransfersTime]=@TransfersTime, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Sort=@Sort,DeliverTime=@DeliverTime,wentifankui=@wentifankui,Yichangchuli=@Yichangchuli,Xingzhengzhuize=@Xingzhengzhuize,SellerOrderId=@SellerOrderId,Dianhua=@Dianhua,Dizhi=@Dizhi,Remark=@Remark,BusinessManagerId=@BusinessManagerId,Biddingcompany=@Biddingcompany,shifouDelivery=@shifouDelivery,Lianxiren=@Lianxiren,CompanyName=@CompanyName,Deliveredstatus=@Deliveredstatus,TransferType=@TransferType,TransferName=@TransferName where [Keyid] =@Keyid ";
+ string sql = "Update OA_DeliverPlanPaiche Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[DeliveredTime]=@DeliveredTime,[Zhuyishixiang]=@Zhuyishixiang,Gongzuokaoping=@Gongzuokaoping, [CarId]=@CarId, [DriverId]=@DriverId,[Transferstatus]=@Transferstatus, [TransfersTime]=@TransfersTime, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Sort=@Sort,DeliverTime=@DeliverTime,wentifankui=@wentifankui,Yichangchuli=@Yichangchuli,Xingzhengzhuize=@Xingzhengzhuize,SellerOrderId=@SellerOrderId,Dianhua=@Dianhua,Dizhi=@Dizhi,Remark=@Remark,BusinessManagerId=@BusinessManagerId,Biddingcompany=@Biddingcompany,shifouDelivery=@shifouDelivery,Lianxiren=@Lianxiren,CompanyName=@CompanyName,Deliveredstatus=@Deliveredstatus,TransferType=@TransferType,TransferName=@TransferName,Wanjiestatus=@Wanjiestatus,WanjieTime=@WanjieTime,Wanjieren=@Wanjieren,Zerenren=@Zerenren,Fakuan=@Fakuan,ZerenTime=@ZerenTime,Zerenoperater=@Zerenoperater where [Keyid] =@Keyid ";
try
{
@@ -304,6 +355,34 @@
return _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
}
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> SelectModelPageWenti(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY1 };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE1, query.Criteria[0].Value, FROMSOUCEEND1);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, SELECTTARGET1, fromSouce, orderbys[0], resultOrderBy);
+ }
+
/// <summary>
/// 鍒犻櫎
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index b0ca9f4..f525f0d 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1888,9 +1888,11 @@
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
<Content Include="Pages\business\DeliverPlanDakaList.aspx" />
+ <Content Include="Pages\business\DeliverPlanWentiEdit.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheEdit.aspx" />
<Content Include="Pages\business\DeliverPlanFujianShow.aspx" />
<Content Include="Pages\business\DeliverPlanLishiList.aspx" />
+ <Content Include="Pages\business\DeliverPlanWentiList.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheList.aspx" />
<Content Include="Pages\business\DeliverPlanChehui.aspx" />
<Content Include="Pages\business\DeliverPlanYijiao.aspx" />
@@ -3380,6 +3382,13 @@
<Compile Include="Pages\business\DeliverPlanDakaList.aspx.designer.cs">
<DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiEdit.aspx.cs">
+ <DependentUpon>DeliverPlanWentiEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiEdit.aspx.designer.cs">
+ <DependentUpon>DeliverPlanWentiEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanPaicheEdit.aspx.cs">
<DependentUpon>DeliverPlanPaicheEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -3401,6 +3410,13 @@
<Compile Include="Pages\business\DeliverPlanLishiList.aspx.designer.cs">
<DependentUpon>DeliverPlanLishiList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiList.aspx.cs">
+ <DependentUpon>DeliverPlanWentiList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanWentiList.aspx.designer.cs">
+ <DependentUpon>DeliverPlanWentiList.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanPaicheList.aspx.cs">
<DependentUpon>DeliverPlanPaicheList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx
new file mode 100644
index 0000000..c8e190e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx
@@ -0,0 +1,184 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanWentiEdit.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanWentiEdit" %>
+
+<!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" />
+ <!--鍓嶅彴椤甸潰start-->
+ <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
+ <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰end-->
+ <script type="text/javascript" language="javascript">
+ function ReBindClients() {
+ $.ajax({
+ url: "/Pages/business/OrderEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { Target: "ReBindClients"},
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ $("#selBuyerId").html(data);
+ }
+ });
+ }
+ function custormerChange(sel) {
+
+
+ CallServer({ Target: "GetCommunication", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj) {
+ document.getElementById('txtLianxiren').value = jobj.BusinessManagers;
+ document.getElementById('txtDizhi').value = jobj.Province + jobj.City + jobj.County + jobj.DetailedAddress ;
+ document.getElementById('txtDianhua').value = jobj.CompanyPhone;
+ document.getElementById('txtCompanyName').value = jobj.CompanyName;
+ } else;
+ });
+ }
+
+
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ window.FastKeyDistinctived = true; //渚嬪蹇嵎閿�(涓嶄娇鐢ㄩ�氱敤蹇嵎閿�)
+ var keyDownHook = new KeyBehaviorHook('keydown');
+ keyDownHook.Regist(window.Keys.S, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+s 淇濆瓨
+ keyDownHook.Regist(window.Keys.Enter, "ClickElement('btnSave')", window.WithKey.Ctrl); //Ctrl+Enter 淇濆瓨
+ keyDownHook.Regist(window.Keys.R, "ClickElement('btnReset')", window.WithKey.Ctrl); //Ctrl+R 閲嶇疆
+ keyDownHook.Regist(window.Keys.Q, "ClickElement('btnBackList')", window.WithKey.Ctrl); //Ctrl+Q 閫�鍑�(Quit)
+
+ $(function () {
+ SelectAddSearch();
+ keyDownHook.Binding();
+ global.SetReqMsg();
+
+ });
+
+
+
+
+ </script>
+
+</head>
+<body style='padding: 0; margin: 0;'>
+ <form id="form1" runat="server" style='padding: 0; margin: 0;' class='form2'>
+
+
+ <table class="table2" id="tbBasic">
+ <thead>
+ <tr>
+ <th colspan="8">
+ 鍩烘湰淇℃伅
+ </th>
+ </tr>
+ </thead>
+ <tr style=" height:1px;">
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none; width:300px;">
+ </td>
+ <td style="border:none;width: 100px;">
+ </td>
+ <td style="border:none;">
+ </td>
+
+ </tr>
+
+ <tr>
+ <td align="right">
+ 鍙嶉闂锛�
+ </td>
+ <td align="left" colspan="3">
+ <span id="spnwentifankui" runat="server" > </span>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
+ 璐ｄ换浜猴細
+ </td>
+ <td align="left">
+ <select keepdefaultstyle='true' id='selZerenren' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td align="right">
+ 杩借矗缃氭锛�
+ </td>
+ <td align="left">
+ <input id='txtFakuan' runat="server" maxlength="20" class="float req" />
+ </td>
+
+
+ </tr>
+ <tr>
+ <td class="contentLeft" colspan="4" style=" padding-left:300px;">
+ <asp:Button ID="btnSaves" runat="server" Text="淇濆瓨" OnClick="btnSave_ServerClick" />
+
+
+
+
+
+ </td>
+ </tr>
+
+ </table>
+
+
+
+ </form>
+
+</body>
+<script type="text/javascript" language="javascript">
+
+
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs
new file mode 100644
index 0000000..d0d73da
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.cs
@@ -0,0 +1,289 @@
+锘�/**
+* OrderEdit.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟鍒楄〃
+* 绫� 鍚嶏細 OrderEdit
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-5-8 13:55 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-8 15:47 鍚村磶鍧� 瀹炵幇涓嬫媺鏁版嵁缁戝畾涓庢暟鎹骇鑱�
+* V0.03 2013-5-8 18:00 鍚村磶鍧� 鍒濇瀹屾垚鏂板绾夸笅璁㈠崟(鏈皟璇�)
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.Sys;
+using CY.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.WebForm.Pages.common;
+using CY.BLL.EC;
+using CY.Model.Inquiry;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanWentiEdit : BasePage
+ {
+ public int Orderid = 0;
+ public int printNum = 0;
+
+ OA_CarManageBll _OA_CarManageBll = null;
+ OA_DeliverPlanPaicheBLL oA_DeliverPlanBLL = null;
+ OA_StaffBLL _OA_StaffBLL = null;
+
+ //鍒濆鍖�
+ public DeliverPlanWentiEdit()
+ {
+
+
+ _OA_CarManageBll = new OA_CarManageBll();
+ oA_DeliverPlanBLL = new OA_DeliverPlanPaicheBLL();
+ _OA_StaffBLL = new OA_StaffBLL();
+
+
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ LoadCommunication();
+ break;
+ case "wanjie":
+ AcceptAll();
+ return;
+ case "ReBindClients":
+ Response.Write(ReLoadClients());
+ break;
+
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+ }
+
+
+ /// <summary>
+ /// 鎵归噺鍙楃悊璁㈠崟
+ /// </summary>
+ public void AcceptAll()
+ {
+
+
+ var keyid = Request["keyid"].ToGuid2();
+
+ var oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(keyid, null, null);
+
+ if (oA_DeliverPlan != null)
+ {
+ if (oA_DeliverPlan.Wanjiestatus == 1)
+ {
+ JavaScript.MessageBox("璁㈠崟宸茬粡瀹岀粨", this, true, false);
+ return;
+ }
+ oA_DeliverPlan.Wanjiestatus = 1;
+ oA_DeliverPlan.Wanjieren = CurrentUser.ShortName;
+ oA_DeliverPlan.WanjieTime = DateTime.Now;
+ if (oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan))
+ {
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
+ return;
+ }
+ else
+ {
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this, true, false);
+ return;
+ }
+
+ }
+
+
+ }
+
+
+ /// <summary>
+ /// 榛樿鎵ц鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+ this.selZerenren.DataSource = _OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ //this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ var keyid = Request["keyid"].ToGuid2();
+ var oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(keyid, null, null);
+
+ if (oA_DeliverPlan != null)
+ {
+ if (oA_DeliverPlan.Wanjiestatus == 1)
+ {
+ JavaScript.MessageBox("璁㈠崟宸茬粡瀹岀粨", this, true, false);
+ return;
+ }
+
+ spnwentifankui.InnerHtml = oA_DeliverPlan.wentifankui;
+ this.selZerenren.Value = oA_DeliverPlan.Zerenren.HasValue ? oA_DeliverPlan.Zerenren.Value.ToString() : "";
+ this.txtFakuan.Value = oA_DeliverPlan.Fakuan.HasValue ? oA_DeliverPlan.Fakuan.Value.ToString("F2") : "";
+ }
+
+
+
+
+
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btnSave_ServerClick(object sender, EventArgs e)
+ {
+
+ if (SaveOrder())
+ {
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true,true);
+ }
+ else
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+
+
+
+
+ /// <summary>
+ /// 鍔犺浇瀹㈡埛鑱旂郴鏂瑰紡
+ /// </summary>
+ private void LoadCommunication()
+ {
+ Response.Clear();
+ string id = Request["id"];
+ if (string.IsNullOrEmpty(id))
+ {
+ Response.Write("-2");
+ return;
+ }
+
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ OA_CorporateClients m_OA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, id.ToGuid2());
+ OA_CustomerCommunications _oA_CustomerCommunications = _oA_CorporateClientsBLL.GetModel_CustomerCommunications(m_OA_CorporateClients.Keyid);
+ _oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
+ _oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
+ _oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
+ Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
+ }
+
+
+
+
+
+
+
+ /// <summary>
+ /// 淇濆瓨璁㈠崟
+ /// </summary>
+ private bool SaveOrder()
+ {
+
+
+ bool isWin = false;
+ try
+ {
+ var keyid = Request["keyid"].ToGuid2();
+ var oA_DeliverPlan = oA_DeliverPlanBLL.GetModelByKeyid(keyid, null, null);
+
+ if (oA_DeliverPlan != null)
+ {
+ oA_DeliverPlan.Zerenren = this.selZerenren.Value.ToInt32();
+ oA_DeliverPlan.Fakuan = this.txtFakuan.Value.Trim().ToDecimal2();
+ oA_DeliverPlan.Zerenoperater = CurrentUser.ShortName;
+ oA_DeliverPlan.ZerenTime = DateTime.Now;
+ }
+
+ isWin = oA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
+
+
+ }
+ catch (Exception ex)
+ {
+ isWin = false;
+ }
+
+
+
+
+
+ return isWin;
+ }
+
+
+
+ /// <summary>
+ /// 閲嶆柊鍔犺浇瀹㈡埛鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ private string ReLoadClients()
+ {
+ try
+ {
+ string res = "<option value=''>璇烽�夋嫨</option>";
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ IList<OA_CorporateClients> m_OA_CorporateClientsList = bll_OA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != m_OA_CorporateClientsList)
+ {
+ m_OA_CorporateClientsList.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && m_OA_CorporateClientsList.Remove(cc));
+ if (m_OA_CorporateClientsList.Count > 0)
+ {
+ foreach (var m_OA_CorporateClients in m_OA_CorporateClientsList)
+ {
+ res = res + ("<option value='" + m_OA_CorporateClients.MemberId + "'>" + m_OA_CorporateClients.CompanyName + "</option>");
+ }
+ }
+ }
+ return res;
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ return "";
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.designer.cs
new file mode 100644
index 0000000..b435f45
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiEdit.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanWentiEdit
+ {
+
+ /// <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>
+ /// spnwentifankui 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnwentifankui;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// txtFakuan 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtFakuan;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx
new file mode 100644
index 0000000..771417a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx
@@ -0,0 +1,582 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanWentiList.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanWentiList" %>
+
+<!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/DeliverPlanPaicheZhuyishixiang.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/DeliverPlanPaicheEdit.aspx", Title: "鏂板閫佽揣鍗�", Width: 900, Height: 750 });
+ }
+ //杩借矗
+ function Xiugai(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?keyid=" + keyid, 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 danjuyijiao(Keyid, Transferstatus) {
+
+
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanYijiao.aspx?ids=" + Keyid, Title: "鍗曟嵁绉讳氦", Width: 600, Height: 300 });
+ }
+
+ //宸ヤ綔鑰冭瘎
+ function wanjie(Keyid) {
+
+ var msg = ('纭瀹岀粨鍚�?');
+ top.Dialog.confirm(msg, function () {
+ top.Dialog.open({ URL: "/Pages/business/DeliverPlanWentiEdit.aspx?Target=wanjie&&keyid=" + Keyid, 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 + '&AttachmentType=3', '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ }
+
+ /*
+鎵撳嵃閫佽揣鍗�
+*/
+ function ToPrintdelev() {
+ 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 + '&CustormerName=' + CustormerName + '&BusinessManager=' + BusinessManager, '', '');
+ }
+ </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 class="ali03">
+ 鍙嶉鏃堕棿锛�
+ </td>
+ <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>
+ <td>
+ <select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 璐ｄ换浜猴細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selZerenren' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
+ </td>
+ <td class="ali03">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
+
+
+
+
+
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鏄惁瀹岀粨锛�
+ </td>
+ <td >
+ <select keepdefaultstyle='true' id='selWanjiestatus' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">瀹岀粨</option>
+ <option value="0">鏈畬缁�</option>
+ </select>
+ </td>
+ <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;' />
+
+
+
+ </td>
+ </tr>
+
+
+ </table>
+ </div>
+
+ <%-- <div class="center" style=" margin-left:0px;">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ 杞﹁締锛� <select keepdefaultstyle='true' id='CarId' runat="server" datatextfield='CarNumber' datavaluefield='Keyid'>
</select>
<div class="box_tool_line">
+ </div>
椹鹃┒鍛橈細 <select keepdefaultstyle='true' id='DriverId' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
+ <div class="box_tool_line">
+ </div>
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+ <div class="box_tool_min">
+ <div class="center" style=" margin-left:0px;">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+
+ <a href="javascript:;" onclick="ToAllAccept2();"><span class="icon_edit">鏂板閫佽揣</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToAllAccept1();"><span class="icon_edit">鍗曟嵁绉讳氦</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToPrintdelev()"><span class="icon_edit">鎵撳嵃</span></a>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </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 width="60">
+ 鍙嶉浜�
+ </th>
+ <th width="100">
+ 瀹㈡埛鍗曚綅
+ </th>
+ <th style="text-align: center;"width="200">
+ 鍙嶉闂
+ </th>
+
+
+
+ <th width="70">
+ 璐ｄ换浜�
+ </th>
+ <th width="70">
+ 杩借矗缃氭
+ </th>
+
+
+
+
+
+
+ <th width="60">
+ 鏄惁瀹岀粨
+ </th>
+
+
+ <th width="100">
+ 鎿嶄綔
+ </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>
+ <%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
+ </td>
+
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd}")%>
+ </td>
+
+ <td>
+ <%#Eval("DriverName")%>
+ </td>
+
+ <td>
+ <%#Eval("CompanyName")%>
+ </td>
+
+ <td>
+ <%#Eval("wentifankui")%>
+ </td>
+ <td>
+ <%#Eval("ZerenrenName")%>
+ </td>
+ <td>
+ <%#Eval("Fakuan","{0:F2}")%>
+ </td>
+
+
+ <td>
+ <%#Eval("WanjiestatusName")%>
+ </td>
+
+
+
+
+ <td style="text-align: center;">
+
+ <a href='javascript:void(0)' menu_member_case_id="case_Zhuize" menu_member_case_name="杩借矗" title='鐐瑰嚮淇敼' class='a_under' onclick='Xiugai("<%#Eval("Keyid")%>","<%#Eval("Transferstatus")%>")'> 杩借矗 </a>
+
+
+ <a href='javascript:void(0)' menu_member_case_id="case_Wanjie" menu_member_case_name="瀹岀粨" title='鐐瑰嚮瀹岀粨' class='a_under' onclick='wanjie("<%#Eval("Keyid")%>")'> 瀹岀粨 </a>
+
+
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ <tr>
+ <td colspan="7" align="right">
+ 鍚堣锛�
+ </td>
+
+
+ <td >
+ <span id="heji" runat="server" ></span>
+ </td>
+
+ <td colspan="2">
+
+ </td>
+
+
+
+ </tr>
+ </tbody>
+ </table>
+ <uc:ucpager id="UCPager1" runat="server" />
+ </div>
+ </div>
+ </form>
+</body>
+</html>
+
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
new file mode 100644
index 0000000..09dc2fb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.cs
@@ -0,0 +1,274 @@
+锘縰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;
+using CY.Infrastructure.Logging;
+using CY.SQLDAL;
+using CY.Model.OA;
+using System.Data.SqlClient;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class DeliverPlanWentiList : BasePage
+ {
+
+ OA_DeliverPlanPaicheBLL _OA_DeliverPlanPaicheBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+
+ //鍒濆鍖�
+ public DeliverPlanWentiList()
+ {
+
+ _OA_DeliverPlanPaicheBLL = new OA_DeliverPlanPaicheBLL();
+ 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 "wanjie":
+ 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.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";
+ this.selDriverIddo.DataBind();
+ this.selDriverIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+
+ this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ this.selWanjiestatus.Value = "0";
+
+
+
+
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object sender, EventArgs e)
+ {
+ BindList();
+ }
+ protected void btn_Search_Click0(object sender, EventArgs e)
+ {
+
+ //this.txtDeliveryTime.Value = this.Button0.Text;
+
+ BindList();
+ }
+
+
+
+ //缁戝畾鍒楄〃
+ private void BindList()
+ {
+
+
+
+
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+
+ IEnumerable<OA_DeliverPlan> oA_DeliverPlans = _OA_DeliverPlanPaicheBLL.SelectModelPageWenti(pa,
+ CurrentUser.MemberId,
+
+ this.txtBeginDate.Value,
+ this.txtEndDate.Value,
+ this.selDriverIddo.Value,
+ this.selZerenren.Value,
+ this.txtCustormerName.Value.Trim(),
+
+ this.selWanjiestatus.Value
+ );
+
+
+
+
+
+
+
+ this.RepClientList.DataSource = oA_DeliverPlans;
+
+ var sss = oA_DeliverPlans.Sum(x => x.Fakuan);
+ this.heji.InnerText = sss.HasValue ? sss.Value.ToString("F2") : "0";
+
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ /// <summary>
+ /// 鎵归噺鍙楃悊璁㈠崟
+ /// </summary>
+ public void AcceptAll()
+ {
+
+
+ var keyid = Request["keyid"].ToGuid2();
+
+ var oA_DeliverPlan = _OA_DeliverPlanPaicheBLL.GetModelByKeyid(keyid,null,null);
+
+ if (oA_DeliverPlan != null)
+ {
+ if(oA_DeliverPlan.Wanjiestatus == 1)
+ {
+ JavaScript.MessageBox("璁㈠崟宸茬粡瀹岀粨", this, true, false);
+ }
+ oA_DeliverPlan.Wanjiestatus = 1;
+ oA_DeliverPlan.Wanjieren = CurrentUser.ShortName;
+ oA_DeliverPlan.WanjieTime = DateTime.Now;
+ if (_OA_DeliverPlanPaicheBLL.UpdateModel(oA_DeliverPlan))
+ {
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, true, true);
+ }
+ else
+ {
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this, true, false);
+ }
+
+ }
+
+
+ }
+
+
+ /// <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_DeliverPlanPaicheBLL.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_DeliverPlanPaicheBLL.InsertModel(oA_DeliverPlan);
+ }
+ else
+ {
+ oA_DeliverPlan.CarId = carid;
+ oA_DeliverPlan.DriverId = driverId;
+ result = _OA_DeliverPlanPaicheBLL.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/DeliverPlanWentiList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.designer.cs
new file mode 100644
index 0000000..ed1071f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiList.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanWentiList
+ {
+
+ /// <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>
+ /// selDriverIddo 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverIddo;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selWanjiestatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selWanjiestatus;
+
+ /// <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>
+ /// heji 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl heji;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
index b31018f..a733b5f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
@@ -104,11 +104,17 @@
var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(ids.ToGuid2(), null, null);
if (deliverPlan.Transferstatus.HasValue && deliverPlan.Transferstatus != 0)
{
- if(deliverPlan.TransferType.Value == 1)
+ if(deliverPlan.TransferType.HasValue && deliverPlan.TransferType.Value == 1)
{
this.IsBusinessManager.Items.Add(new ListItem(deliverPlan.TransferName, "1"));
this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
- this.IsBusinessManager.SelectedValue = deliverPlan.Transferstatus.Value.ToString();
+ this.IsBusinessManager.SelectedValue = deliverPlan.TransferType.Value.ToString();
+ }
+ else if (deliverPlan.TransferType.HasValue && deliverPlan.TransferType.Value == 2)
+ {
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+ this.IsBusinessManager.SelectedValue = deliverPlan.TransferType.Value.ToString();
}
else
{
--
Gitblit v1.9.1