From e110200c2e32a0f82f474fa38b315ae6360f2dc4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 三月 2025 08:39:38 +0800
Subject: [PATCH] 在订单列表 送货安排 点击打印送货单 选择送货日期 默认最晚的送货日期，默认当天，可以修改 完成 司机查询 拥有司机小程序权限的人员 完成 新增送货 可以选择客户，也可以 填写临时客户 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 17
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.designer.cs | 44 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx | 27 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx | 42 ++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs | 10
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs | 55 ++-
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs | 24 +
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.cs | 136 +++++++++
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 55 ++-
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx | 44 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.designer.cs | 63 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs | 222 +++++++++++++++
23 files changed, 716 insertions(+), 90 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 10ccaac..a2cf9a1 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -962,7 +962,12 @@
this.LiuyangStatus = isChange ? MyConvert.ConvertToInt32(value) : this.LiuyangStatus;
theValue = this.LiuyangStatus;
}
-
+ else if ("printunit".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 102)
+ {
+ this.OrderExtend.printunit = isChange ? MyConvert.ConvertToInt(value).Value : this.OrderExtend.printunit;
+ theValue = this.OrderExtend.printunit;
+ }
+
#endregion
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index c0ba89d..c13d29f 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -56,6 +56,8 @@
/// </summary>
public string BuyerName { get; set; }
+ public string CompanyName { get; set; }
+
public string BusinessManager { get; set; }
public string DizhiLianxirenDianhua { get; set; }
@@ -595,125 +597,130 @@
this.Lianxiren = isChange ? MyConvert.ConvertToString(value) : Lianxiren;
theValue = this.Lianxiren;
}
- else if ("SumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("SumPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
{
this.SumPrice = isChange ? MyConvert.ConvertToDecimal(value) : SumPrice;
theValue = this.SumPrice;
}
- else if ("PayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("PayedMoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
{
this.PayedMoney = isChange ? MyConvert.ConvertToDecimal(value) : PayedMoney;
theValue = this.PayedMoney;
}
- else if ("shoukuanshijian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("shoukuanshijian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 37)
{
this.shoukuanshijian = isChange ? MyConvert.ConvertToString(value) : shoukuanshijian;
theValue = this.shoukuanshijian;
}
- else if ("Paytime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 34)
+ else if ("Paytime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 38)
{
this.Paytime = isChange ? MyConvert.ConvertToInt32(value) : Paytime;
theValue = this.Paytime;
}
- else if ("OrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
+ else if ("OrderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 39)
{
this.OrderId = isChange ? MyConvert.ConvertToInt32(value) : OrderId;
theValue = this.OrderId;
}
- else if ("YujihuikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
+ else if ("YujihuikuanTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 40)
{
this.YujihuikuanTime = isChange ? MyConvert.ConvertToDateTime(value) : YujihuikuanTime;
theValue = this.YujihuikuanTime;
}
- else if ("YujihuikuanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 36)
+ else if ("YujihuikuanKeyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 41)
{
this.YujihuikuanKeyid = isChange ? MyConvert.ConvertToGuid(value) : YujihuikuanKeyid;
theValue = this.YujihuikuanKeyid;
}
- else if ("quyu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 37)
+ else if ("quyu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 42)
{
this.quyu = isChange ? MyConvert.ConvertToString(value) : quyu;
theValue = this.quyu;
}
- else if ("ContracttypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 38)
+ else if ("ContracttypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 43)
{
this.ContracttypeName = isChange ? MyConvert.ConvertToString(value) : ContracttypeName;
theValue = this.ContracttypeName;
}
- else if ("Contractmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 39)
+ else if ("Contractmoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 44)
{
this.Contractmoney = isChange ? MyConvert.ConvertToDecimal(value) : Contractmoney;
theValue = this.Contractmoney;
}
- else if ("ExpiretypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 40)
+ else if ("ExpiretypeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 45)
{
this.ExpiretypeName = isChange ? MyConvert.ConvertToString(value) : ExpiretypeName;
theValue = this.ExpiretypeName;
}
- else if ("ExpireTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 41)
+ else if ("ExpireTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 46)
{
this.ExpireTime = isChange ? MyConvert.ConvertToDateTime(value) : ExpireTime;
theValue = this.ExpireTime;
}
- else if ("gendanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 42)
+ else if ("gendanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 47)
{
this.gendanshuliang = isChange ? MyConvert.ConvertToDecimal(value) : gendanshuliang;
theValue = this.gendanshuliang;
}
- else if ("xinzengshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 43)
+ else if ("xinzengshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 48)
{
this.xinzengshuliang = isChange ? MyConvert.ConvertToDecimal(value) : xinzengshuliang;
theValue = this.xinzengshuliang;
}
- else if ("wanjieshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 44)
+ else if ("wanjieshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
{
this.wanjieshuliang = isChange ? MyConvert.ConvertToDecimal(value) : wanjieshuliang;
theValue = this.wanjieshuliang;
}
- else if ("xiadanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 45)
+ else if ("xiadanshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
{
this.xiadanshuliang = isChange ? MyConvert.ConvertToDecimal(value) : xiadanshuliang;
theValue = this.xiadanshuliang;
}
- else if ("kaipiaojine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 46)
+ else if ("kaipiaojine".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
{
this.kaipiaojine = isChange ? MyConvert.ConvertToDecimal(value) : kaipiaojine;
theValue = this.kaipiaojine;
}
- else if ("huifangshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 47)
+ else if ("huifangshuliang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
{
this.huifangshuliang = isChange ? MyConvert.ConvertToDecimal(value) : huifangshuliang;
theValue = this.huifangshuliang;
}
- else if ("chaxuntime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 48)
+ else if ("chaxuntime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 53)
{
this.chaxuntime = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntime;
theValue = this.chaxuntime;
}
- else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 49)
+ else if ("chaxuntimestart".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 54)
{
this.chaxuntimestart = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimestart;
theValue = this.chaxuntimestart;
}
- else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 50)
+ else if ("chaxuntimeend".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 55)
{
this.chaxuntimeend = isChange ? MyConvert.ConvertToDateTime(value) : chaxuntimeend;
theValue = this.chaxuntimeend;
}
- else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 51)
+ else if ("huikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 56)
{
this.huikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : huikuankehu;
theValue = this.huikuankehu;
}
- else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 52)
+ else if ("weihuikuankehu".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 57)
{
this.weihuikuankehu = isChange ? MyConvert.ConvertToDecimal(value) : weihuikuankehu;
theValue = this.weihuikuankehu;
}
-
+ else if ("CompanyName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 58)
+ {
+ this.CompanyName = isChange ? MyConvert.ConvertToString(value) : CompanyName;
+ theValue = this.CompanyName;
+ }
+
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs
index c6a7f7a..76cc231 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs
@@ -48,7 +48,7 @@
}
/// <summary>
- /// AttachmentType
+ /// AttachmentType 1鍙戠エ 2 闄勪欢 3
/// </summary>
public int? AttachmentType
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 2f41745..469bf31 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -3181,7 +3181,7 @@
if (deliverorderId==null || deliverorderId.Equals(Guid.Empty))
return null;//閿欒鏁版嵁杩斾細绌�
- IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+ IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.printunit,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
return result;//杩斿洖缁撴灉
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index fa3f3d5..4c0a027 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -23,14 +23,14 @@
/// 鏌ヨ鏉ユ簮
/// </summary>
const string FROMSOUCEBEFORE = " ( select distinct od.*,d_Shifouwanjie.Name as TransferstatusName, " +
- " oe.CompanyName as BuyerName,eo.shuliang, os.Name as BusinessManager,od.Dizhi+' 鑱旂郴浜猴細'+od.Lianxiren+' 鐢佃瘽锛�'+od.Dianhua as DizhiLianxirenDianhua, " +
+ " od.CompanyName as BuyerName,eo.shuliang, os.Name as BusinessManager,od.Dizhi+' 鑱旂郴浜猴細'+od.Lianxiren+' 鐢佃瘽锛�'+od.Dianhua as DizhiLianxirenDianhua, " +
" ocar.[CarNumber] as CarName,oss.Name as DriverName " +
- " from [OA_DeliverPlan] od inner join [OA_CorporateClients] oe on oe.Keyid = od.[BuyerId] " +
+ " from [OA_DeliverPlan] od left join [OA_CorporateClients] oe on oe.Keyid = od.[BuyerId] " +
// " inner join (select count(*) as shuliang,eo.BuyerId,ISNULL(eoe.DelayTime,eo.DeliveryTime) DeliveryTime from [EC_OrderBasic] eo inner join [EC_OrderExtend] eoe on eo.Keyid=eoe.Keyid where eo.OrderState =4 group by eo.BuyerId,ISNULL(eoe.DelayTime,eo.DeliveryTime) ) eo on oe.Keyid =eo.BuyerId " +
" left join (select count(*) as shuliang,eoe.DeliveryOrderId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.DeliveryOrderId ) eo on od.Keyid =eo.DeliveryOrderId " + // eo.OrderState =4
- " inner join [OA_CustomerCommunications] oc on oe.Keyid = oc.Keyid " +
+ // " inner join [OA_CustomerCommunications] oc on oe.Keyid = oc.Keyid " +
//" left join [OA_DeliverPlan] od on oe.Keyid = od.[BuyerId] and DATEDIFF(day,eo.[DeliveryTime], od.[DeliverTime])=0 " +
- " left join [OA_Staff] os on oe.BusinessManagerId = os.Keyid " +
+ " left join [OA_Staff] os on od.BusinessManagerId = os.Keyid " +
" left join [OA_CarManage] ocar on od.[CarId] = ocar.Keyid " +
" left join [OA_Staff] oss on od.[DriverId] = oss.Keyid " +
" Left Join Sys_Dictionary as d_Shifouwanjie On(d_Shifouwanjie.DicType= '閫佽揣鍗曠Щ浜ょ姸鎬�' and od.[Transferstatus]= d_Shifouwanjie.MeanValue) where 0=0 ";
@@ -107,6 +107,7 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",trueModel.CompanyName),
};
try
{
@@ -181,6 +182,7 @@
new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
+ new SqlParameter("@CompanyName",trueModel.CompanyName),
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 63205e2..8d524a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1887,6 +1887,7 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\DeliverPlanShifou.aspx" />
<Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
<Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
@@ -3344,6 +3345,13 @@
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverPlanShifou.aspx.cs">
+ <DependentUpon>DeliverPlanShifou.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverPlanShifou.aspx.designer.cs">
+ <DependentUpon>DeliverPlanShifou.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/DeliverOrderPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx
index 3246e45..86c65e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx
@@ -159,10 +159,10 @@
<%#Eval("DocumentName")%>
</td>
<td>
- <%#Eval("PrintType.PrintName")%>
+ <%#Eval("PrintSizeName")%>
</td>
<td>
- <%#Eval("OrderExtend.PrintNum")%>
+ <%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>
</td>
<td>
<%#Eval("UnitPrice", "{0:F}")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index 3833296..861021a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -24,7 +24,7 @@
using System.Text;
using CY.BLL.Sys;
using System.Transactions;
-
+using CY.Model.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -36,6 +36,8 @@
OA_StaffBLL oA_StaffBLL = null;
OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
OA_DeliverPlanBLL oA_DeliverPlanBLL = null;
+ EC_OrderPrintParameterBLL eC_OrderPrintParameterBLL = null;
+ Sys_DictionaryBLL dictionaryBLL = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
/// </summary>
@@ -47,6 +49,8 @@
oA_StaffBLL = new OA_StaffBLL();
_OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
oA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ dictionaryBLL = new Sys_DictionaryBLL();
}
/// <summary>
@@ -71,20 +75,23 @@
List<EC_AcceptWayByOrder> eC_AcceptWayByOrders = null;
- OA_CorporateClients oA_CorporateClients = null;
+ //OA_CorporateClients oA_CorporateClients = null;
OA_CorporateClients oA_CorporateClientsBiddingcompany = null;
OA_DeliverPlan oA_DeliverPlan = null;
try
{
oA_DeliverPlan = _OA_DeliverPlanBLL.GetModelByKeyid(deliverorderId, null, null);
- oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_DeliverPlan.BuyerId);
- oA_CorporateClientsBiddingcompany = _oA_CorporateClientsBLL.SelectBiddingcompanyByFirmId(CurrentUser.MemberId).Where(x => x.Keyid1 == oA_CorporateClients.Biddingcompany).FirstOrDefault();
- if (oA_CorporateClientsBiddingcompany != null)
- {
- this.spnD.InnerText = oA_CorporateClientsBiddingcompany.CompanyName;
- }
- OA_Staff oA_Staff = oA_StaffBLL.GetModelByKeyid(oA_CorporateClients.BusinessManagerId);
+ // oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, oA_DeliverPlan.BuyerId);
+
+ oA_CorporateClientsBiddingcompany = _oA_CorporateClientsBLL.SelectBiddingcompanyByFirmId(CurrentUser.MemberId).Where(x => x.Keyid1 == oA_DeliverPlan.Biddingcompany).FirstOrDefault();
+ if (oA_CorporateClientsBiddingcompany != null)
+ {
+ this.spnD.InnerText = oA_CorporateClientsBiddingcompany.CompanyName;
+ }
+
+
+ OA_Staff oA_Staff = oA_StaffBLL.GetModelByKeyid(oA_DeliverPlan.BusinessManagerId);
if (oA_Staff != null)
{
this.spnB.InnerText = oA_Staff.Name;
@@ -94,7 +101,7 @@
{
this.spnC.InnerText = oA_Staffsss.Name;
}
- this.spnBuyerName.InnerText = oA_CorporateClients.CompanyName;
+ this.spnBuyerName.InnerText = oA_DeliverPlan.CompanyName;
this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
@@ -114,14 +121,11 @@
List<Model.EC_OrderBasic> eC_OrderBasics = _eC_OrderBasicBLL.GetEC_OrderBasicListBydeliverorderId(deliverorderId,CurrentUser.MemberId).ToList();
-
- rptData.DataSource = eC_OrderBasics;
- rptData.DataBind();
decimal SumPrice = 0;
- if (eC_OrderBasics!=null && eC_OrderBasics.Count > 0)
+ if (eC_OrderBasics != null && eC_OrderBasics.Count > 0)
{
- for(int i=0;i< eC_OrderBasics.Count; i++)
+ for (int i = 0; i < eC_OrderBasics.Count; i++)
{
if (i == 0)
{
@@ -133,8 +137,24 @@
this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
}
- SumPrice += eC_OrderBasics[i].SumPrice.Value;
+ }
+ SumPrice += eC_OrderBasics[i].SumPrice.Value;
+ EC_OrderPrintParameter _eC_OrderPrintParameter = eC_OrderPrintParameterBLL.GetModel(eC_OrderBasics[i].Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+ eC_OrderBasics[i].PrintSizeName = _inquiryCommonModel.PrintSizeName;
+ var sss = dictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x=>x.MeanValue == eC_OrderBasics[i].OrderExtend.printunit).FirstOrDefault();
+ if (sss != null)
+ {
+ eC_OrderBasics[i].yssldw = sss.Name;
}
}
}
@@ -142,6 +162,9 @@
{
this.spnRemark.InnerText = oA_DeliverPlan.Remark;
}
+ rptData.DataSource = eC_OrderBasics;
+ rptData.DataBind();
+
this.spnSumPrice.InnerText = SumPrice.ToString("#0.00");
this.spnSumPriceUpper.InnerText = GetChinaMoney(SumPrice);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
index 2c55f58..c5ddf2f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx
@@ -39,6 +39,7 @@
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;
});
}
@@ -138,19 +139,25 @@
</td>
<td align="left">
- <span id='spnCustormerControl'><select id='selBuyerId' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
+ <span id='spnCustormerControl'><select id='selBuyerId' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' selinputhtml="True" sign="" style=" width:123px;"></select>
<%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
</span>
</td>
<td align="right">
+ 鏀惰揣鍗曚綅锛�
+ </td>
+ <td align="left">
+ <input id='txtCompanyName' runat="server" maxlength="200" class='Sreq' />
+ </td>
+ </tr>
+ <tr>
+ <td align="right">
鑱旂郴浜猴細
</td>
<td align="left">
<input id='txtLianxiren' runat="server" maxlength="200" />
</td>
- </tr>
- <tr>
<td align="right">
鑱旂郴鐢佃瘽锛�
</td>
@@ -158,26 +165,22 @@
<input id='txtDianhua' class='req' runat="server" maxlength="200" />
</td>
- <td align="right">
+
+ </tr>
+ <tr>
+ <td align="right">
鏀惰揣鍦板潃锛�
</td>
<td align="left">
<input id='txtDizhi' class='req' runat="server" maxlength="200" style="width:300px;" />
</td>
- </tr>
- <tr>
<td align="right">
閫佽揣鏃堕棿锛�
</td>
<td align="left">
<input id='txtDeliverTime' class='date req' runat="server" />
</td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
+
</tr>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
index 0ef63b2..c653c04 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.cs
@@ -145,6 +145,7 @@
_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));
}
@@ -178,7 +179,7 @@
SellerOrderId = ssss + (aaaaaaaaaaaa.ToInt32().Value + 1).ToString("000");
}
//this.SellerOrderId.InnerText = SellerOrderId;
- OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+
OA_DeliverPlan oA_DeliverPlan = new OA_DeliverPlan();
@@ -186,7 +187,22 @@
oA_DeliverPlan.Keyid = Guid.NewGuid();
oA_DeliverPlan.FirmId = CurrentUser.MemberId;
oA_DeliverPlan.DeliverTime = DateTime.Parse(this.txtDeliverTime.Value);
- oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ if (string.IsNullOrWhiteSpace(this.selBuyerId.Value))
+ {
+ oA_DeliverPlan.BuyerId = Guid.Empty;
+ oA_DeliverPlan.BusinessManagerId = 0;
+ oA_DeliverPlan.Biddingcompany = 0;
+
+ }
+ else
+ {
+ oA_DeliverPlan.BuyerId = this.selBuyerId.Value.ToGuid2();
+ OA_CorporateClients oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, this.selBuyerId.Value.ToGuid2());
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
+ oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
+ }
+
oA_DeliverPlan.DeliveredTime = null;
oA_DeliverPlan.Zhuyishixiang = "";
oA_DeliverPlan.Gongzuokaoping = "";
@@ -204,9 +220,9 @@
oA_DeliverPlan.Dianhua = this.txtDianhua.Value;
oA_DeliverPlan.Dizhi = this.txtDizhi.Value;
oA_DeliverPlan.Remark = this.txtRemark.Value;
- oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
- oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+
oA_DeliverPlan.shifouDelivery = 1;
+ oA_DeliverPlan.CompanyName = this.txtCompanyName.Value;
isWin = oA_DeliverPlanBLL.InsertModel(oA_DeliverPlan);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.designer.cs
index 6320e78..9c33de4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanEdit.aspx.designer.cs
@@ -51,6 +51,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBuyerId;
/// <summary>
+ /// txtCompanyName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCompanyName;
+
+ /// <summary>
/// txtLianxiren 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index f739ebe..65caeeb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -66,7 +66,7 @@
//鍔犺浇鏌ヨ鏉′欢
protected void InitialSelectData()
{
- this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ 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();
@@ -79,7 +79,7 @@
this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
+ 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();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx
new file mode 100644
index 0000000..aab3d14
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx
@@ -0,0 +1,44 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DeliverPlanShifou.aspx.cs" Inherits="CY.WebForm.Pages.business.DeliverPlanShifou" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <title>瀹屽伐</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ function songhuo(shifouDelivery, ids, buyerid, orderId) {
+ var sss = $('#txtWorkTime').val();
+ if (sss == "") {
+ alertMsg('蹇呴』濉啓閫佽揣鏃堕棿锛�');
+ return;
+ }
+ if (shifouDelivery == '1') {
+ OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + buyerid + '&orderId=' + orderId + '&shifouDelivery=' + shifouDelivery + '&DeliveryTime=' + sss);
+ } else {
+ OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + buyerid + '&orderId=' + orderId + '&shifouDelivery=' + shifouDelivery + '&DeliveryTime=' + sss);
+ }
+
+ top.Dialog.close();
+ }
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div class="box1">
+ <table class="tableStyle">
+
+ <tr>
+
+ <td class="ali03 w100px">閫佽揣鏃堕棿锛�</td>
+ <td><input id="txtWorkTime" type="text" runat="server" class='date req' maxlength='10' /></td>
+ </tr>
+
+ <tr>
+ <td class="ali03 w100px">鏄惁瀹夋帓閫佽揣?</td>
+ <td ><input type="button" value="鏄�" onclick="songhuo('1','<%=ids %>','<%=buyerid %>','<%=orderId %>');" /> <input type="button" value="鍚�" onclick="songhuo('2','<%=ids %>','<%=buyerid %>','<%=orderId %>');" /></td>
+ </tr>
+ </table>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.cs
new file mode 100644
index 0000000..f999ac9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.cs
@@ -0,0 +1,136 @@
+锘縰sing 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.BLL;
+using CY.Model;
+using CY.Infrastructure.Common;
+using System.Text;
+using CY.BLL.Sys;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //璁㈠崟瀹屽伐
+ public partial class DeliverPlanShifou : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
+ public string orderId = "";
+ public string buyerid = "";
+ public string ids = "";
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public DeliverPlanShifou()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ bll_EC_MemberBasicBLL = new EC_MemberBasicBLL();
+ }
+
+ /// <summary>
+ /// 椤甸潰鍔犺浇
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ BindData();
+ }
+ }
+
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ public void BindData()
+ {
+
+ //var shifouDelivery = Request["shifouDelivery"];
+ orderId = Request["orderId"];
+
+
+
+ buyerid = Request["buyerid"];
+
+ ids = Request["ids"];
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ EC_OrderBasic eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.ToInt32().Value);
+ if(eC_OrderBasic!=null&& eC_OrderBasic.DeliveryTime.HasValue)
+ {
+ this.txtWorkTime.Value = eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ this.txtWorkTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ }
+
+
+
+ }
+
+ /// <summary>
+ /// 鎻愪氦浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ //string[] ids = Request["ids"].ToString2().Trim(',').Split(',');
+ //List<EC_OrderOperate> m_EC_OrderOperateList = new List<EC_OrderOperate>();
+ //List<EC_OrderBasic> m_EC_OrderBasicList = new List<EC_OrderBasic>();
+ //bool Iscomplete = Request["radioStatus"].ToBoolean2();
+ //int? states = Iscomplete ? 4 : 3;
+ //foreach (var item in ids)
+ //{
+ // EC_OrderBasic m_EC_OrderBasic = bll_EC_OrderBasicBLL.SelectModelById(item.ToInt32() ?? 0);
+ // if (m_EC_OrderBasic != null && m_EC_OrderBasic.Keyid != null)
+ // {
+ // m_EC_OrderBasic.CompledState = Iscomplete;
+ // m_EC_OrderBasic.CompledTime = this.txtWorkTime.Value.ToDateTime2();
+ // m_EC_OrderBasic.CompledOperator = CurrentUser.ShortName;
+ // m_EC_OrderBasic.CompledRemarks = this.txtRemarks.Value;
+ // m_EC_OrderBasicList.Add(m_EC_OrderBasic);
+
+ // m_EC_OrderOperateList.Add(new EC_OrderOperate()
+ // {
+ // OperateType = states,
+ // OrderId = m_EC_OrderBasic.Keyid.ToInt32(),
+ // Operator = CurrentUser.ShortName,
+ // Remark = this.txtRemarks.Value
+ // });
+ // }
+
+ // EC_OrderBasic m_EC_OrderBasic_Out = bll_EC_OrderBasicBLL.SelectFromOutOrderById(item.ToInt32() ?? 0);
+ // if (m_EC_OrderBasic_Out != null && m_EC_OrderBasic_Out.Keyid != null)
+ // {
+ // m_EC_OrderBasic_Out.CompledState = Iscomplete;
+ // m_EC_OrderBasic_Out.CompledTime = this.txtWorkTime.Value.ToDateTime2();
+ // m_EC_OrderBasic_Out.CompledOperator = CurrentUser.ShortName;
+ // m_EC_OrderBasic_Out.CompledRemarks = this.txtRemarks.Value;
+ // m_EC_OrderBasicList.Add(m_EC_OrderBasic_Out);
+
+ // m_EC_OrderOperateList.Add(new EC_OrderOperate()
+ // {
+ // OperateType = states,
+ // OrderId = m_EC_OrderBasic_Out.Keyid.ToInt32(),
+ // Operator = CurrentUser.ShortName,
+ // Remark = this.txtRemarks.Value
+ // });
+ // }
+ //}
+
+ //if (bll_EC_OrderBasicBLL.CompletedOrderList(m_EC_OrderOperateList, m_EC_OrderBasicList))
+ // JavaScript.MessageBox("鎿嶄綔鎴愬姛",this,true,true);
+ //else
+ // JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.designer.cs
new file mode 100644
index 0000000..ee4d2d3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanShifou.aspx.designer.cs
@@ -0,0 +1,44 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class DeliverPlanShifou
+ {
+
+ /// <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>
+ /// txtWorkTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtWorkTime;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 4bc84c6..0e15ff0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
<title>璁㈠崟鍒楄〃</title>
<uc:cmshead id="CMSHead1" runat="server" />
- <script src="../../js/business/Order.js?v=6" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=7" type="text/javascript"></script>
<script type="text/javascript">
//璁㈠崟璇勪环
function evaluationModel(orderid) {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
index 185498b..90fbc38 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -267,14 +267,24 @@
</select>
</td>
<td class="ali03">
-
+ 寮�绁ㄧ姸鎬�
</td>
<td>
- <asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
- <input type="hidden" id='txtCommission' runat="server" />
+ <select keepdefaultstyle='true' id='selKaipiaoshenqing' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <option value="" >璇烽�夋嫨</option>
+ <option value="2" >鏈敵璇�</option>
+ <option value="1" >鏈紑绁�</option>
+ <option value="3" >宸插紑绁�</option>
+ </select>
</td>
</tr>
+ <tr>
+ <td colspan="8">
+ <asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+ <input type="hidden" id='txtCommission' runat="server" />
+ </td>
+ </tr>
<%-- <tr>
<td class="ali03">
鏀舵鐘舵�侊細
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
index c96ed87..c68a0e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
@@ -475,7 +475,8 @@
this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
this.selPayStates.DataBind();
this.selPayStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selPayStates.Value = "0";
+ //this.selPayStates.Value = "0";
+ this.selKaipiaoshenqing.Value = "2";
//this.selOrderStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
//this.selOrderStates.DataBind();
@@ -551,6 +552,7 @@
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 24, this.selKaipiaoshenqing.Value);
SearchParam = searchParam;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
index 169e00e..c72e578 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
@@ -114,6 +114,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
/// <summary>
+ /// selKaipiaoshenqing 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selKaipiaoshenqing;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
index db979d1..ce627c1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
@@ -74,11 +74,11 @@
otherInfo.NowTime = new Date().ToString('yyyy骞碝M鏈坉d鏃�');
SetJsonToDom(otherInfo, 'spn', 'innerHTML');
}
- $(function () {
+ //$(function () {
- LoadOrders();
- loadOtherInfo();
- });
+ // LoadOrders();
+ // loadOtherInfo();
+ //});
// window.printBeginCallBack = function () {
// printStyle = "<link href=\"../../Styles/ParticularWQJ.css\" rel=\"stylesheet\" type=\"text/css\" /><style>" + $("#style1").html() + "</style>";
@@ -104,18 +104,18 @@
<tbody>
<tr>
<td>
- 鏀惰揣鍗曚綅锛�<span id='spnBuyerName'>#</span>
+ 鏀惰揣鍗曚綅锛�<span id='spnBuyerName' runat="server" >#</span>
</td>
<td style='width: 150px;'>
- 　 鐢佃瘽锛�<span id='spnBuyerPhone'>#</span>
+ 　 鐢佃瘽锛�<span id='spnBuyerPhone' runat="server" >#</span>
</td>
</tr>
<tr>
<td>
- 鏀惰揣鍦板潃锛�<span id='spnBuyerAddress'>#</span>
+ 鏀惰揣鍦板潃锛�<span id='spnBuyerAddress' runat="server" >#</span>
</td>
<td>
- 閫佽揣鏃堕棿锛�<span id='spnNowTime'>#</span>
+ 閫佽揣鏃堕棿锛�<span id='spnNowTime' runat="server" >#</span>
</td>
</tr>
<tr>
@@ -159,12 +159,36 @@
</tr>
</thead>
<tbody id='tb_orders'>
+ <asp:repeater id="rptData" runat="server">
+ <itemtemplate>
+ <tr>
+ <td>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%#Eval("DocumentName")%>
+ </td>
+ <td>
+ <%#Eval("PrintSizeName")%>
+ </td>
+ <td>
+ <%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>
+ </td>
+ <td>
+ <%#Eval("UnitPrice", "{0:F}")%>
+ </td>
+ <td>
+ <%#Eval("sumPrice","{0:F}")%>
+ </td>
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
</tbody>
</table>
<table border="0" cellpadding="0" cellspacing="0" class="tbJE">
<tr>
<td align="right">
- 閲戦鍚堣(澶у啓)锛�<b><span id='spnSumPriceUpper'>#</span> </b>　　閲戦锛�<span id='spnSumPrice'>#</span>
+ 閲戦鍚堣(澶у啓)锛�<b><span id='spnSumPriceUpper' runat="server" >#</span> </b>　　閲戦锛�<span id='spnSumPrice' runat="server" >#</span>
</td>
</tr>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
index 28b9af3..176d4d7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.cs
@@ -24,6 +24,7 @@
using System.Text;
using CY.BLL.Sys;
using System.Transactions;
+using CY.Model.Inquiry;
namespace CY.WebForm.Pages.business
{
@@ -38,6 +39,8 @@
OA_StaffBLL oA_StaffBLL = null;
OA_DeliverPlanBLL _OA_DeliverPlanBLL = null;
OA_DeliverPlanBLL oA_DeliverPlanBLL = null;
+ EC_OrderPrintParameterBLL eC_OrderPrintParameterBLL = null;
+ Sys_DictionaryBLL dictionaryBLL = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
/// </summary>
@@ -49,6 +52,8 @@
oA_StaffBLL = new OA_StaffBLL();
_OA_DeliverPlanBLL = new OA_DeliverPlanBLL();
oA_DeliverPlanBLL = new OA_DeliverPlanBLL();
+ eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
+ dictionaryBLL = new Sys_DictionaryBLL();
}
/// <summary>
@@ -64,6 +69,9 @@
Guid buyerid = MyConvert.ConvertToGuid(Request["buyerid"]);
+
+ var DeliveryTime = MyConvert.ConvertToDateTime( Request["DeliveryTime"]);
+
if (string.IsNullOrEmpty(Request["ids"]) || Guid.Empty.Equals(buyerid))
{
Response.Clear();
@@ -90,6 +98,7 @@
eC_AcceptWayByOrders = _eC_OrderBasicBLL.SelectOrderAddress(Request["ids"].Trim()) as List<EC_AcceptWayByOrder>;
oA_CorporateClients = _oA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, buyerid);
+ this.spnBuyerName.InnerText = oA_CorporateClients.CompanyName;
oA_CorporateClientsBiddingcompany = _oA_CorporateClientsBLL.SelectBiddingcompanyByFirmId(CurrentUser.MemberId).Where(x=>x.Keyid1 == oA_CorporateClients.Biddingcompany).FirstOrDefault();
if (oA_CorporateClientsBiddingcompany != null)
{
@@ -211,7 +220,7 @@
oA_DeliverPlan.Lianxiren = model.Accepter;
oA_DeliverPlan.Keyid = Guid.NewGuid();
oA_DeliverPlan.FirmId = CurrentUser.MemberId;
- oA_DeliverPlan.DeliverTime = eC_OrderBasic.DeliveryTime;
+ oA_DeliverPlan.DeliverTime = DeliveryTime.HasValue? DeliveryTime: eC_OrderBasic.DeliveryTime;
oA_DeliverPlan.BuyerId = eC_OrderBasic.BuyerId;
oA_DeliverPlan.DeliveredTime = null;
oA_DeliverPlan.Zhuyishixiang = "";
@@ -232,8 +241,13 @@
oA_DeliverPlan.Remark = "";
oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId??0;
oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany??0;
+ oA_DeliverPlan.CompanyName = oA_CorporateClients.CompanyName;
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.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
+ this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
string[] orderids = Request["ids"].Split(',');
foreach (string oid in orderids)
{
@@ -248,6 +262,10 @@
{
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.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
+ this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
oA_DeliverPlan.Dianhua = model.AccepterPhone;
oA_DeliverPlan.Dizhi = model.AccepterAddress;
@@ -255,10 +273,66 @@
oA_DeliverPlan.Remark = "";
oA_DeliverPlan.BusinessManagerId = oA_CorporateClients.BusinessManagerId ?? 0;
oA_DeliverPlan.Biddingcompany = oA_CorporateClients.Biddingcompany ?? 0;
+ oA_DeliverPlan.CompanyName = oA_CorporateClients.CompanyName;
//oA_DeliverPlan.shifouDelivery = shifouDelivery;
- oA_DeliverPlan.DeliverTime = eC_OrderBasic.DeliveryTime;
+ //oA_DeliverPlan.DeliverTime = eC_OrderBasic.DeliveryTime;
_OA_DeliverPlanBLL.UpdateModel(oA_DeliverPlan);
}
+
+
+
+ List<Model.EC_OrderBasic> eC_OrderBasics = _eC_OrderBasicBLL.GetOrderByIds(Request["ids"]).ToList();
+ decimal SumPrice = 0;
+
+ if (eC_OrderBasics != null && eC_OrderBasics.Count > 0)
+ {
+ for (int i = 0; i < eC_OrderBasics.Count; i++)
+ {
+ if (i == 0)
+ {
+ EC_AwbInfo m_EC_AwbInfoaaa = _eC_OrderBasicBLL.SelectAwbInfoById(eC_OrderBasics[i].Keyid.Value);
+
+
+ if (m_EC_AwbInfoaaa != null)
+ {
+ this.spnRemark.InnerText = m_EC_AwbInfoaaa.Remark;
+
+ }
+ }
+ SumPrice += eC_OrderBasics[i].SumPrice.Value;
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = eC_OrderPrintParameterBLL.GetModel(eC_OrderBasics[i].Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+
+ eC_OrderBasics[i].PrintSizeName = _inquiryCommonModel.PrintSizeName;
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(eC_OrderBasics[i].Keyid.Value);
+ eC_OrderBasics[i].OrderExtend.PrintNum = _eC_OrderBasic.OrderExtend.PrintNum;
+
+ var sss = dictionaryBLL.GetDataByType("鍗板埛鍗曚綅").Where(x => x.MeanValue == _eC_OrderBasic.OrderExtend.printunit).FirstOrDefault();
+ if (sss != null)
+ {
+ eC_OrderBasics[i].yssldw = sss.Name;
+ }
+
+ }
+ }
+
+ rptData.DataSource = eC_OrderBasics;
+ rptData.DataBind();
+
+
+
+
+ this.spnSumPrice.InnerText = SumPrice.ToString("#0.00");
+ this.spnSumPriceUpper.InnerText = GetChinaMoney(SumPrice);
}
catch (Exception ex)
{
@@ -324,5 +398,149 @@
}
+
+
+
+ public static string GetChinaMoney(decimal money)
+ {
+ string[] strArray;
+ string str = "";
+ string str2 = "";
+ string str3 = money.ToString("0.00");
+ switch (str3.Trim().Length)
+ {
+ case 4:
+ strArray = new string[] { str3[0].ToString(), "y", str3[2].ToString(), "j", str3[3].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 5:
+ strArray = new string[] { str3[0].ToString(), "s", str3[1].ToString(), "y", str3[3].ToString(), "j", str3[4].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 6:
+ strArray = new string[] { str3[0].ToString(), "b", str3[1].ToString(), "s", str3[2].ToString(), "y", str3[4].ToString(), "j", str3[5].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 7:
+ strArray = new string[] { str3[0].ToString(), "q", str3[1].ToString(), "b", str3[2].ToString(), "s", str3[3].ToString(), "y", str3[5].ToString(), "j", str3[6].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 8:
+ strArray = new string[] { str3[0].ToString(), "w", str3[1].ToString(), "q", str3[2].ToString(), "b", str3[3].ToString(), "s", str3[4].ToString(), "y", str3[6].ToString(), "j", str3[7].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 9:
+ strArray = new string[] { str3[0].ToString(), "s", str3[1].ToString(), "w", str3[2].ToString(), "q", str3[3].ToString(), "b", str3[4].ToString(), "s", str3[5].ToString(), "y", str3[7].ToString(), "j", str3[8].ToString(), "f" };
+ str = string.Concat(strArray);
+ break;
+
+ case 10:
+ strArray = new string[] {
+ str3[0].ToString(), "b", str3[1].ToString(), "s", str3[2].ToString(), "w", str3[3].ToString(), "q", str3[4].ToString(), "b", str3[5].ToString(), "s", str3[6].ToString(), "y", str3[8].ToString(), "j",
+ str3[9].ToString(), "f"
+ };
+ str = string.Concat(strArray);
+ break;
+
+ case 11:
+ strArray = new string[] {
+ str3[0].ToString(), "q", str3[1].ToString(), "b", str3[2].ToString(), "s", str3[3].ToString(), "w", str3[4].ToString(), "q", str3[5].ToString(), "b", str3[6].ToString(), "s", str3[7].ToString(), "y",
+ str3[9].ToString(), "j", str3[10].ToString(), "f"
+ };
+ str = string.Concat(strArray);
+ break;
+
+ case 12:
+ strArray = new string[] {
+ str3[0].ToString(), "m", str3[1].ToString(), "q", str3[2].ToString(), "b", str3[3].ToString(), "s", str3[4].ToString(), "w", str3[5].ToString(), "q", str3[6].ToString(), "b", str3[7].ToString(), "s",
+ str3[8].ToString(), "y", str3[10].ToString(), "j", str3[11].ToString(), "f"
+ };
+ str = string.Concat(strArray);
+ break;
+ }
+ for (int i = 0; i < str.Trim().Length; i++)
+ {
+ switch (str[i])
+ {
+ case '0':
+ str2 = str2 + "闆�";
+ break;
+
+ case '1':
+ str2 = str2 + "澹�";
+ break;
+
+ case '2':
+ str2 = str2 + "璐�";
+ break;
+
+ case '3':
+ str2 = str2 + "鍙�";
+ break;
+
+ case '4':
+ str2 = str2 + "鑲�";
+ break;
+
+ case '5':
+ str2 = str2 + "浼�";
+ break;
+
+ case '6':
+ str2 = str2 + "闄�";
+ break;
+
+ case '7':
+ str2 = str2 + "鏌�";
+ break;
+
+ case '8':
+ str2 = str2 + "鎹�";
+ break;
+
+ case '9':
+ str2 = str2 + "鐜�";
+ break;
+
+ case 'b':
+ str2 = str2 + "浣�";
+ break;
+
+ case 'f':
+ str2 = str2 + "鍒�";
+ break;
+
+ case 'j':
+ str2 = str2 + "瑙�";
+ break;
+
+ case 'm':
+ str2 = str2 + "浜�";
+ break;
+
+ case 'q':
+ str2 = str2 + "浠�";
+ break;
+
+ case 's':
+ str2 = str2 + "鎷�";
+ break;
+
+ case 'w':
+ str2 = str2 + "涓�";
+ break;
+
+ case 'y':
+ str2 = str2 + "鍏�";
+ break;
+ }
+ }
+ return str2;
+ }
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.designer.cs
index a0727a7..3505772 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx.designer.cs
@@ -51,6 +51,42 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl SellerOrderId;
/// <summary>
+ /// spnBuyerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnBuyerName;
+
+ /// <summary>
+ /// spnBuyerPhone 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnBuyerPhone;
+
+ /// <summary>
+ /// spnBuyerAddress 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnBuyerAddress;
+
+ /// <summary>
+ /// spnNowTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnNowTime;
+
+ /// <summary>
/// spnRemark 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -60,6 +96,33 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnRemark;
/// <summary>
+ /// rptData 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptData;
+
+ /// <summary>
+ /// spnSumPriceUpper 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnSumPriceUpper;
+
+ /// <summary>
+ /// spnSumPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spnSumPrice;
+
+ /// <summary>
/// spnB 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a04d821..5cdb982 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -404,13 +404,16 @@
}
else {
if (DeliveryOrderId == null || DeliveryOrderId == "" || DeliveryOrderId == "00000000-0000-0000-0000-000000000000") {
- var r = confirm("鏄惁瀹夋帓閫佽揣?");
- if (r == true) {
- OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
- }
- else {
- OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
- }
+ var url = "/Pages/business/DeliverPlanShifou.aspx?ids=" + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId;
+ top.Dialog.open({ URL: url, Title: "閫佽揣鏃ユ湡", Height: 300, Width: 680 });
+
+ //var r = confirm("鏄惁瀹夋帓閫佽揣?");
+ //if (r == true) {
+ // OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
+ //}
+ //else {
+ // OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
+ //}
} else {
OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
}
--
Gitblit v1.9.1