From 9eaaeff84fedc8424ee9c7ea31bfd60cc1e8ff4e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 05 三月 2025 08:42:33 +0800
Subject: [PATCH] 点击派车 弹出窗口 操作 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs | 246 +++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx | 81 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.designer.cs | 62 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs | 62 +++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 14
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs | 18 -
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx | 90 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs | 269 ++++++++++++++
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 50 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 20
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx | 112 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs | 4
14 files changed, 1,002 insertions(+), 44 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index c13d29f..f8e0a1a 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -139,6 +139,37 @@
get;
set;
}
+
+ /// <summary>
+ /// 鐗╂祦鐘舵��
+ /// </summary>
+ public int? Deliveredstatus
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷 1 瀹㈡埛缁忕悊 2 宸ュ巶鐗╂祦閮�
+ /// </summary>
+ public int? TransferType
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// 绉讳氦绫诲瀷鍚嶇О
+ /// </summary>
+ public string TransferName
+ {
+ get;
+ set;
+ }
+
+
+
/// <summary>
/// 绉讳氦鏃堕棿
/// </summary>
@@ -720,7 +751,24 @@
this.CompanyName = isChange ? MyConvert.ConvertToString(value) : CompanyName;
theValue = this.CompanyName;
}
-
+ else if ("Deliveredstatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 59)
+ {
+ this.Deliveredstatus = isChange ? MyConvert.ConvertToInt32(value) : Deliveredstatus;
+ theValue = this.Deliveredstatus;
+ }
+
+ else if ("TransferType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 60)
+ {
+ this.TransferType = isChange ? MyConvert.ConvertToInt32(value) : TransferType;
+ theValue = this.TransferType;
+ }
+
+ else if ("TransferName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 61)
+ {
+ this.TransferName = isChange ? MyConvert.ConvertToString(value) : TransferName;
+ theValue = this.TransferName;
+ }
+
return theValue;
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index 4c0a027..3ec8a47 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -107,7 +107,10 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
- new SqlParameter("@CompanyName",trueModel.CompanyName),
+ new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
+ new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
+ new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
+ new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
};
try
{
@@ -167,8 +170,8 @@
TransfersTime,
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@CreateTime",trueModel.CreateTime),
- new SqlParameter("@Updater",trueModel.Updater),
- new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@Updater",trueModel.Updater.HasValue?trueModel.Updater.Value:Guid.Empty),
+ 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),
@@ -182,7 +185,10 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
- new SqlParameter("@CompanyName",trueModel.CompanyName),
+ new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
+ new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
+ new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
+ new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 8d524a9..cb2dfac 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1887,6 +1887,8 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\DeliverPlanYijiao.aspx" />
+ <Content Include="Pages\business\DeliverPlanPaiche.aspx" />
<Content Include="Pages\business\DeliverPlanShifou.aspx" />
<Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
@@ -3345,6 +3347,20 @@
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanYijiao.aspx.cs">
+ <DependentUpon>DeliverPlanYijiao.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanYijiao.aspx.designer.cs">
+ <DependentUpon>DeliverPlanYijiao.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaiche.aspx.cs">
+ <DependentUpon>DeliverPlanPaiche.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanPaiche.aspx.designer.cs">
+ <DependentUpon>DeliverPlanPaiche.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\DeliverPlanShifou.aspx.cs">
<DependentUpon>DeliverPlanShifou.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index 861021a..d90af40 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -104,7 +104,7 @@
this.spnBuyerName.InnerText = oA_DeliverPlan.CompanyName;
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
- this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
+ this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
index 190445f..48b42b0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx
@@ -116,6 +116,99 @@
}
+ ///鎵归噺鍙楃悊
+ 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 });
+ }
+ }
+
+
///鎵归噺鍙楃悊
@@ -285,7 +378,7 @@
<tr>
- <td class="ali03">
+ <%-- <td class="ali03">
鏂板閫佽揣杞﹁締锛�
</td>
<td >
@@ -298,14 +391,17 @@
<td >
<select keepdefaultstyle='true' id='selDriverIddo' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
- </td>
+ </td>--%>
- <td colspan="5">
- <input type="button" value='娲捐溅' onclick='ToAllAccept2();' />
- <input type="button" value='鏂板閫佽揣' onclick='ToAddorder();' />
- <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept1();' />
- <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 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;' />
+
+ <input type="button" value='鏂板閫佽揣' onclick='ToAddorder();' />
+ <input type="button" value='娲捐溅' onclick='ToAllAccept3();' />
+ <input type="button" value='鍗曟嵁绉讳氦' onclick='ToAllAccept4();' />
<input type="button" value='鎵撳嵃鍏ㄩ儴' onclick='ToPrintdelev();' />
+
</td>
</tr>
@@ -453,7 +549,7 @@
<a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%> </a>
</td>
<td style="text-align: center;">
- <%#(Eval("TransferstatusName").ToString()==""||Eval("TransferstatusName").ToString()=="鏈Щ浜�")?"鏈Щ浜�":"鈭�"%>
+ <%#Eval("TransferName")==null || Eval("TransferName").ToString()==""?"鏈Щ浜�":Eval("TransferName")%>
</td>
<td>
<a href='javascript:void(0)' title='鎵撳嵃閫佽揣鍗�' class='a_under' onclick='ToPrintDriverorder("<%#Eval("Keyid")%>")'> 鎵撳嵃 </a>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index 65caeeb..f4e3645 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -79,17 +79,17 @@
this.selCarId.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.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.selCarIddo.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
- this.selCarIddo.DataTextField = "CarNumber";
- this.selCarIddo.DataValueField = "Keyid";
- this.selCarIddo.DataBind();
- this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selCarIddo.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
+ //this.selCarIddo.DataTextField = "CarNumber";
+ //this.selCarIddo.DataValueField = "Keyid";
+ //this.selCarIddo.DataBind();
+ //this.selCarIddo.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
this.Button0.Text = "閫炬湡";
this.Button1.Text = DateTime.Now.ToString("yyyy-MM-dd");
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 85c9fb7..1004a35 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.designer.cs
@@ -141,24 +141,6 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
/// <summary>
- /// selCarIddo 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selCarIddo;
-
- /// <summary>
- /// selDriverIddo 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverIddo;
-
- /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
new file mode 100644
index 0000000..cc040d8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx
@@ -0,0 +1,90 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanPaiche.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanPaiche" %>
+
+<!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">
+
+
+
+
+
+
+
+
+
+
+ </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">
+
+ <select keepdefaultstyle='true' id='selDriverId' runat="server" datatextfield='Name' datavaluefield='Keyid' class="Sreq">
+ </select>
+
+ </td>
+ <td align="right">
+
+ </td>
+ <td align="left">
+
+ </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/DeliverPlanPaiche.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
new file mode 100644
index 0000000..a945dd9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.cs
@@ -0,0 +1,246 @@
+锘�/**
+* 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 DeliverPlanPaiche : BasePage
+ {
+
+ OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+ //鍒濆鍖�
+ public DeliverPlanPaiche()
+ {
+
+ _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+
+ }
+
+ /// <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 "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>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+
+
+
+
+
+ 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("璇烽�夋嫨", ""));
+
+
+ string keyid = Request["keyid"];
+
+
+ }
+ }
+
+ /// <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 ids = Request["ids"].ToString().Trim(',').Split(',');
+
+
+
+ foreach (var keyid in ids)
+ {
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
+
+ deliverPlan.DriverId = this.selDriverId.Value.ToInt32();
+
+ var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+ if (carManage != null)
+ {
+ deliverPlan.CarId = carManage.Keyid ?? 0;
+ }
+ else
+ {
+ deliverPlan.CarId = 0;
+ }
+ isWin = _OA_DeliverPlanBLL.UpdateModel(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/DeliverPlanPaiche.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs
new file mode 100644
index 0000000..31bc593
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaiche.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanPaiche
+ {
+
+ /// <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>
+ /// selDriverId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDriverId;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx
new file mode 100644
index 0000000..b6464f1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx
@@ -0,0 +1,81 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanYijiao.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanYijiao" %>
+
+<!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">
+
+
+
+
+
+
+
+
+
+
+ </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>
+ <td class="ali03">
+ 椹鹃┒鍛橈細
+ </td>
+ <td >
+
+ <asp:RadioButtonList runat="server" ID="IsBusinessManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w240px NoBorder">
+ <%-- <asp:ListItem Text="涓氬姟缁忕悊" Value="1" />
+ <asp:ListItem Text="宸ュ巶鐗╂祦閮�" Value="2" />--%>
+ </asp:RadioButtonList>
+ </td>
+ <td align="right">
+
+ </td>
+ <td align="left">
+
+ </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/DeliverPlanYijiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
new file mode 100644
index 0000000..ab0bd5e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.cs
@@ -0,0 +1,269 @@
+锘�/**
+* 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 DeliverPlanYijiao : BasePage
+ {
+
+ OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_CarManageBll _OA_CarManageBll = null;
+
+
+ //鍒濆鍖�
+ public DeliverPlanYijiao()
+ {
+
+ _OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ _OA_CarManageBll = new OA_CarManageBll();
+
+ }
+
+ /// <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 "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>
+ private void Page_Load_Default()
+ {
+
+
+
+ if (!IsPostBack && !IsCallback)
+ {
+
+
+ this.IsBusinessManager.Items.Add(new ListItem("涓氬姟缁忕悊", "1"));
+ this.IsBusinessManager.Items.Add(new ListItem("宸ュ巶鐗╂祦閮�", "2"));
+
+ this.IsBusinessManager.SelectedValue = "1";
+
+
+
+
+
+ string keyid = Request["keyid"];
+
+
+
+
+
+ }
+ }
+
+ /// <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 ids = Request["ids"].ToString().Trim(',').Split(',');
+
+
+
+ foreach (var keyid in ids)
+ {
+ var deliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(keyid.ToGuid2(), null, null);
+
+ deliverPlan.TransferType = this.IsBusinessManager.SelectedValue.ToInt32();
+ if(this.IsBusinessManager.SelectedValue == "2")
+ {
+ deliverPlan.TransferName = "宸ュ巶鐗╂祦閮�";
+ }
+ else
+ {
+ if(deliverPlan.BusinessManagerId.HasValue && deliverPlan.BusinessManagerId.Value > 0)
+ {
+ var oA_Staff = bll_OA_StaffBLL.GetModelByKeyid(deliverPlan.BusinessManagerId.Value);
+ if (oA_Staff != null)
+ {
+ deliverPlan.TransferName = oA_Staff.Name;
+ }
+ else
+ {
+ deliverPlan.TransferName = "涓氬姟缁忕悊";
+ }
+ }
+ else
+ {
+ deliverPlan.TransferName = "涓氬姟缁忕悊";
+ }
+
+
+ }
+
+
+ var carManage = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId).Where(x => x.StaffID == deliverPlan.DriverId).FirstOrDefault();
+ if (carManage != null)
+ {
+ deliverPlan.CarId = carManage.Keyid ?? 0;
+ }
+ isWin = _OA_DeliverPlanBLL.UpdateModel(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/DeliverPlanYijiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.designer.cs
new file mode 100644
index 0000000..e95a217
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanYijiao.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanYijiao
+ {
+
+ /// <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>
+ /// IsBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.RadioButtonList IsBusinessManager;
+
+ /// <summary>
+ /// btnSaves 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btnSaves;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
index 176d4d7..d1f0097 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
@@ -245,7 +245,7 @@
oA_DeliverPlan.shifouDelivery = shifouDelivery;
_OA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
- this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
+ this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
string[] orderids = Request["ids"].Split(',');
@@ -263,7 +263,7 @@
OA_DeliverPlan oA_DeliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(eC_OrderBasic.DeliveryOrderId,null,null);
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
- this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
+ this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
--
Gitblit v1.9.1