From 991dbfbad93e1cb12d589b02100ac81a847a72f8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 05 十二月 2024 08:42:56 +0800
Subject: [PATCH] 增加客户预存款开票
---
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs | 9
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs | 17
CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs | 208 +++++++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.cs | 183 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs | 17
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx | 19
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.designer.cs | 62 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 21
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs | 19
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx | 36 +
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx | 102 ++++
CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs | 29 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.designer.cs | 179 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx | 214 ++++++++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 1
24 files changed, 1,151 insertions(+), 62 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index d048350..ad971c2 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -157,18 +157,6 @@
Condition += " and ok.BusinessManagerId = '" + BusinessManagerId + "'";
if (!string.IsNullOrEmpty(CustormerName))
Condition += " and oe.CompanyName like '%" + CustormerName + "%'";
-
- if (!string.IsNullOrEmpty(PayStates))
- {
- if (PayStates == "2")
- {
- Condition += " and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
- }
- else if (PayStates == "1")
- {
- Condition += " and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ";
- }
- }
if (!string.IsNullOrEmpty(HuikuanStates))
{
if (HuikuanStates == "2")
@@ -180,6 +168,18 @@
Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
}
}
+ if (!string.IsNullOrEmpty(PayStates))
+ {
+ if (PayStates == "2")
+ {
+ Condition += " and (( ok.Shenqingleixing ='璁㈠崟寮�绁�' and not EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney]>=ok.[kpmoney] ) )";
+ }
+ else if (PayStates == "1")
+ {
+ Condition += " and ( ( ok.Shenqingleixing ='璁㈠崟寮�绁�' and EXISTS ( select eoe.[KaipiaoshenqingId] from [EC_OrderExtend] eoe inner join [EC_OrderBasic] eob on eob.Keyid = eoe.Keyid where ok.Keyid = eoe.[KaipiaoshenqingId] and eob.PayState !=-1 ) ) or ( ok.Shenqingleixing ='棰勪粯娆惧紑绁�' and ok.[Kehumoney] < ok.[kpmoney] ) )";
+ }
+ }
+
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
index a50f322..659abb8 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaonewcuishou.cs
@@ -48,6 +48,17 @@
set;
}
+
+ /// <summary>
+ /// 鍌敹鎯呭喌
+ /// </summary>
+ public string Cuikuanqingkuang
+ {
+ get;
+ set;
+ }
+
+
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
@@ -112,6 +123,12 @@
this.CuishouTime = isChange ? MyConvert.ConvertToDateTime(value) : CuishouTime;
theValue = this.CuishouTime;
}
+ else if ("Cuikuanqingkuang".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Cuikuanqingkuang = isChange ? MyConvert.ConvertToString(value) : Cuikuanqingkuang;
+ theValue = this.Cuikuanqingkuang;
+ }
+
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
index 818ba13..a25ea63 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Kaipiaoshenqing.cs
@@ -176,6 +176,23 @@
get;
set;
}
+
+ /// <summary>
+ /// 鐢宠绫诲瀷
+ /// </summary>
+ public string Shenqingleixing { get; set; }
+
+
+
+ /// <summary>
+ /// 瀹㈡埛鏀舵閲戦
+ /// </summary>
+ public decimal? Kehumoney
+ {
+ get;
+ set;
+ }
+
#endregion Model
#region Visiter
@@ -351,7 +368,17 @@
this.kpmoney = isChange ? MyConvert.ConvertToDecimal(value) : kpmoney;
theValue = this.kpmoney;
}
-
+ else if ("Shenqingleixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 29)
+ {
+ this.Shenqingleixing = isChange ? MyConvert.ConvertToString(value) : Shenqingleixing;
+ theValue = this.Shenqingleixing;
+ }
+ else if ("Kehumoney".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30)
+ {
+ this.Kehumoney = isChange ? MyConvert.ConvertToDecimal(value) : Kehumoney;
+ theValue = this.Kehumoney;
+ }
+
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs
index 6c5291e..94d79d1 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KaipiaonewcuishouDAL.cs
@@ -67,11 +67,11 @@
new SqlParameter("@CuishouTime",trueModel.CuishouTime),
new SqlParameter("@Creater",trueModel.Creater),
-
+ new SqlParameter("@Cuikuanqingkuang",string.IsNullOrWhiteSpace(trueModel.Cuikuanqingkuang)?"":trueModel.Cuikuanqingkuang),
};
- string sql = "Insert Into OA_Kaipiaonewcuishou ( [KaipiaoId] , [Creater],[CreateTime],[CuishouTime] )"
- + " Values ( @KaipiaoId, @Creater,@CreateTime,@CuishouTime )";
+ string sql = "Insert Into OA_Kaipiaonewcuishou ( [KaipiaoId] , [Creater],[CreateTime],[CuishouTime],[Cuikuanqingkuang] )"
+ + " Values ( @KaipiaoId, @Creater,@CreateTime,@CuishouTime,@Cuikuanqingkuang )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -107,9 +107,9 @@
new SqlParameter("@CuishouTime",trueModel.CuishouTime),
new SqlParameter("@Creater",trueModel.Creater),
-
+ new SqlParameter("@Cuikuanqingkuang",string.IsNullOrWhiteSpace(trueModel.Cuikuanqingkuang)?"":trueModel.Cuikuanqingkuang),
};
- string sql = "Update OA_Kaipiaonewcuishou Set [Creater]=@Creater,[CreateTime]=@CreateTime,[CuishouTime]=@CuishouTime where [Keyid] =@Keyid ";
+ string sql = "Update OA_Kaipiaonewcuishou Set [Creater]=@Creater,[CreateTime]=@CreateTime,[CuishouTime]=@CuishouTime,[Cuikuanqingkuang]=@Cuikuanqingkuang where [Keyid] =@Keyid ";
try
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index 7f3ad88..74f87f3 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -100,9 +100,12 @@
new SqlParameter("@kpmoney",trueModel.kpmoney),
new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
+ new SqlParameter("@Shenqingleixing",string.IsNullOrEmpty(trueModel.Shenqingleixing)?"":trueModel.Shenqingleixing),
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
+
};
- string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney)"
- + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney )";
+ string sql = "Insert Into OA_Kaipiaoshenqing ([Keyid],[FirmId],[BuyerId],[Kaipiaoshenqing],[Kehuqianshou], [KehuqianshouTime], [KehuqianshouCreater],[KaipiaoquerenTime], [KaipiaoquerenCreater],[BusinessManagerId], [Creater],[CreateTime],[Updater],[LastUpdateTime],[SellerOrderId],remark,ApprovalStatus,Zengjianmoney,Dingdanshu,kpmoney,Huikuanmoney,Shenqingleixing,Kehumoney)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@Kaipiaoshenqing, @Kehuqianshou, @KehuqianshouTime, @KehuqianshouCreater, @KaipiaoquerenTime, @KaipiaoquerenCreater, @BusinessManagerId, @Creater,@CreateTime,@Updater,@LastUpdateTime,@SellerOrderId,@remark,@ApprovalStatus,@Zengjianmoney,@Dingdanshu,@kpmoney,@Huikuanmoney,@Shenqingleixing,@Kehumoney )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -179,9 +182,10 @@
new SqlParameter("@Fapiaohao",string.IsNullOrEmpty(trueModel.Fapiaohao)?"":trueModel.Fapiaohao),
new SqlParameter("@Huikuanmoney",trueModel.Huikuanmoney.HasValue?trueModel.Huikuanmoney.Value:new decimal(0)),
ShoukuanTime,
+ new SqlParameter("@Kehumoney",trueModel.Kehumoney.HasValue?trueModel.Kehumoney.Value:new decimal(0)),
};
- string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime where [Keyid] =@Keyid ";
+ string sql = "Update OA_Kaipiaoshenqing Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[Kaipiaoshenqing]=@Kaipiaoshenqing,[Kehuqianshou]=@Kehuqianshou, [KehuqianshouTime]=@KehuqianshouTime, [KehuqianshouCreater]=@KehuqianshouCreater,[KaipiaoquerenTime]=@KaipiaoquerenTime, [KaipiaoquerenCreater]=@KaipiaoquerenCreater,[BusinessManagerId]=@BusinessManagerId, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,ApprovalStatus=@ApprovalStatus,Zengjianmoney=@Zengjianmoney,Kehuqianshoutupian=@Kehuqianshoutupian,Fapiaohao=@Fapiaohao,Huikuanmoney=@Huikuanmoney,ShoukuanTime=@ShoukuanTime,Kehumoney=@Kehumoney where [Keyid] =@Keyid ";
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index fa855a3..49d4d82 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1885,6 +1885,7 @@
<Content Include="Pages\business\BargainPriceByFirm.aspx" />
<Content Include="Pages\business\InvoicingHuikuan.aspx" />
<Content Include="Pages\business\InvoicingCuishou.aspx" />
+ <Content Include="Pages\business\kaipiaoKehu.aspx" />
<Content Include="Pages\business\OrderListBatchKaipiao.aspx" />
<Content Include="Pages\business\WorkBookUpLoad.aspx" />
<Content Include="Pages\business\DeliverWorkBookSonghuo.aspx" />
@@ -2035,6 +2036,7 @@
<Content Include="Pages\common\U_Info.ascx" />
<Content Include="Pages\common\U_Link.ascx" />
<Content Include="Pages\common\U_Login.ascx" />
+ <Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
<Content Include="Pages\financial\FirmAccountPrint.aspx" />
<Content Include="Pages\financial\FirmAccountPrintTable.aspx" />
<Content Include="Pages\financial\MemberOrderMoneyReceive.aspx" />
@@ -3303,6 +3305,13 @@
<Compile Include="Pages\business\InvoicingCuishou.aspx.designer.cs">
<DependentUpon>InvoicingCuishou.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\kaipiaoKehu.aspx.cs">
+ <DependentUpon>kaipiaoKehu.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\kaipiaoKehu.aspx.designer.cs">
+ <DependentUpon>kaipiaoKehu.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\OrderListBatchKaipiao.aspx.cs">
<DependentUpon>OrderListBatchKaipiao.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -4353,6 +4362,13 @@
<Compile Include="Pages\common\U_Login.ascx.designer.cs">
<DependentUpon>U_Login.ascx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.cs">
+ <DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.designer.cs">
+ <DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\FirmAccountPrint.aspx.cs">
<DependentUpon>FirmAccountPrint.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index 4d4810c..846f031 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -86,11 +86,16 @@
//鍌敹
function ViewCuishou(personId) {
- top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 400, Height: 600 });
+ top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 600, Height: 800 });
}
//鏀舵
- function ViewShoukuan(personId) {
- top.Dialog.open({ URL: "/Pages/financial/InvoicingShoukuan.aspx?id=" + personId, Title: "鏀舵", Width: 600, Height: 800 });
+ function ViewShoukuan(personId, shenqingleixing) {
+ if (shenqingleixing == "璁㈠崟寮�绁�") {
+ top.Dialog.open({ URL: "/Pages/financial/InvoicingShoukuan.aspx?id=" + personId, Title: "璁㈠崟鏀舵", Width: 600, Height: 800 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/financial/DepositsCustomerFapiao.aspx?Keyid=" + personId, Title: "瀹㈡埛棰勪粯娆惧瓨娆�", Width: 900, Height: 680 });
+ }
+
}
//鍥炴
@@ -246,6 +251,9 @@
<th style="text-align: center;" width="70">
鐢宠寮�绁ㄦ椂闂�
</th>
+ <th style="text-align: center;" width="70">
+ 鐢宠绫诲瀷
+ </th>
<th style="text-align: center;" width="70">
涓氬姟缁忕悊
</th>
@@ -297,6 +305,11 @@
<td>
<%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("Shenqingleixing")%>
+
+
</td>
<td style="text-align: center;">
<%#Eval("BusinessManager")%>
@@ -356,7 +369,7 @@
<a href='javascript:void(0)' title='浠樻鐧昏' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 浠樻鐧昏 </a>
<a href='javascript:void(0)' title='鍌' class='a_under' onclick='ViewCuishou("<%#Eval("Keyid")%>")'> 鍌 </a>
- <a href='javascript:void(0)' title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 鏀舵 </a>
+ <a href='javascript:void(0)' title='鏀舵' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Shenqingleixing")%>")'> 鏀舵 </a>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 1b70e3c..cec4fae 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -39,6 +39,7 @@
LF_OrderFileBLL _lF_OrderFileBLL = null;
EC_OrderBLL _eC_OrderBLL = null;
OA_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
+
/// <summary>
/// 鍒濆鍖栨瀯閫�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
index c275dd5..c014709 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx.cs
@@ -90,14 +90,17 @@
isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ if(oA_Kaipiaoshenqing.Shenqingleixing == "璁㈠崟寮�绁�")
+ {
+ EC_OrderExtend model = new EC_OrderExtend();
+ model.KaipiaoshenqingId = oA_Kaipiaoshenqing.Keyid;
+ model.KaipiaoshenqingTime = oA_Kaipiaoshenqing.KaipiaoquerenTime;
+ model.Kaipiaoshenqing = 3;
+ model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
- EC_OrderExtend model = new EC_OrderExtend();
- model.KaipiaoshenqingId = oA_Kaipiaoshenqing.Keyid;
- model.KaipiaoshenqingTime = oA_Kaipiaoshenqing.KaipiaoquerenTime;
- model.Kaipiaoshenqing = 3;
- model.KaipiaoshenqingCreater = CurrentUser.TrueMemberId;
-
- isWin = _eC_OrderBLL.NewUpdateKaipiaoshenqings(model);
+ isWin = _eC_OrderBLL.NewUpdateKaipiaoshenqings(model);
+ }
+
if (isWin)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx
index 9dda4b6..90c8e2f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx
@@ -59,6 +59,17 @@
<td class="contentLeft" colspan='2' >鍌鏃堕棿锛� <input type="text" id="txtStartTime" runat="server" class="date w150px" datefmt="yyyy-MM-dd HH:mm" /></td>
</tr>
+ <tr >
+ <td class="contentLeft" colspan='2'> 鍌鎯呭喌锛� </td>
+
+ </tr>
+ <tr >
+
+ <td class="contentLeft" colspan='2' > <textarea id="txtCuikuanqingkuang" runat="server" maxlength="250" style=" width:570px; height:120px;"></textarea></td>
+
+ </tr>
+
+
<tr>
<td class="contentLeft" colspan='2'>
　　　　　<input type="button" value="纭" runat="server" id='btnSubmit' />
@@ -75,6 +86,9 @@
</th>
<th style="text-align: center;" width="70">
鍌鏃堕棿
+ </th>
+ <th style="text-align: center;" width="200">
+ 鍌敹鎯呭喌
</th>
<th style="text-align: center;" width="70">
鍌浜�
@@ -98,6 +112,11 @@
</td>
<td style="text-align: center;">
+ <%#Eval("Cuikuanqingkuang")%>
+
+
+ </td>
+ <td style="text-align: center;">
<%#Eval("Creater")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs
index 6cefff6..70f69f3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.cs
@@ -107,6 +107,7 @@
oA_Kaipiaonewcuishou.Creater = CurrentUser.ShortName;
oA_Kaipiaonewcuishou.CreateTime = DateTime.Now;
oA_Kaipiaonewcuishou.CuishouTime = oA_Kaipiaoshenqing.ShoukuanTime;
+ oA_Kaipiaonewcuishou.Cuikuanqingkuang = this.txtCuikuanqingkuang.Value;
isWin = oA_KaipiaonewcuishouBLL.InsertModel(oA_Kaipiaonewcuishou);
if (isWin)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs
index d79fc3a..b376111 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingCuishou.aspx.designer.cs
@@ -87,6 +87,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartTime;
/// <summary>
+ /// txtCuikuanqingkuang 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtCuikuanqingkuang;
+
+ /// <summary>
/// btnSubmit 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
index 30d286e..47593b9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -13,6 +13,11 @@
top.Dialog.open({ URL: url, Title: "寮�绁ㄧ敵璇风‘璁�", Height: 600, Width: 580 });
}
+ function ToInvoicingkehu() {
+ var url = "/Pages/business/kaipiaoKehu.aspx";
+ top.Dialog.open({ URL: url, Title: "棰勪粯娆惧紑绁�", Height: 600, Width: 580 });
+ }
+
//璁㈠崟璇勪环
function evaluationModel(orderid) {
dialog.open({ URL: "/Pages/business/EvaluationSeller.aspx?orderid=" + orderid, Title: "鍗栧璇勪环", Width: 580, Height: 300 });
@@ -196,14 +201,14 @@
<td>
<input id='txtOrderId' runat="server" maxlength='25' />
</td>
- <td class="ali03">
+ <%--<td class="ali03">
璁㈠崟绫诲瀷锛�
</td>
<td>
<select keepdefaultstyle='true' class=' firstfocus' id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid">
</select>
</td>
- <%--<td class="ali03">
+ <td class="ali03">
璁㈠崟鏉ユ簮锛�
</td>
<td>
@@ -216,6 +221,12 @@
<td>
<input id='txtCreaterName' runat="server" maxlength='50' />
</td>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
</tr>
<tr style="padding-left: 50px">
<%--<td class="ali03">
@@ -225,12 +236,7 @@
<select keepdefaultstyle='true' id='selCustormerLevels' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>--%>
- <td class="ali03">
- 瀹㈡埛鍚嶇О锛�
- </td>
- <td>
- <input id='txtCustormerName' runat="server" maxlength='50' />
- </td>
+
<td class="ali03">
瀹㈡埛缁忕悊锛�
</td>
@@ -252,6 +258,13 @@
<select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
</select>
</td>--%>
+ <td class="ali03">
+ 鏀舵鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>
<td class="ali03">
</td>
@@ -318,10 +331,13 @@
<div class="box_tool_line">
</div>--%>
- <a href="javascript:;" menu_member_case_id="case_ToBatchRemoveList" menu_member_case_name="鍘婚櫎璁㈠崟" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
+ <a href="javascript:;" onclick="ToBatchRemove();"><span class="icon_remove">鍘婚櫎璁㈠崟</span></a>
<div class="box_tool_line">
</div>
- <a href="javascript:;" menu_member_case_id="case_ToBatchInvoicingList" menu_member_case_name="寮�绁ㄧ敵璇�" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <a href="javascript:;" onclick="ToBatchInvoicingList();"><span class="icon_edit">寮�绁ㄧ敵璇�</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="ToInvoicingkehu();"><span class="icon_edit">棰勪粯娆惧紑绁�</span></a>
<div class="box_tool_line">
</div>
<%-- <a href="javascript:;" menu_member_case_id="case_ToBatchPayList" menu_member_case_name="鎵归噺鏀舵" onclick="ToBatchPayList();"><span class="icon_edit">鎵归噺鏀舵</span></a>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
index a1dbd80..c96ed87 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.cs
@@ -463,18 +463,19 @@
Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
SysInquiry_PrintingTypeBLL _sysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
- this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModles();
- this.selPrintTypes.DataBind();
- this.selPrintTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
+ //this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModles();
+ //this.selPrintTypes.DataBind();
+ //this.selPrintTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
//this.selOrderTypes.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟绫诲瀷");
//this.selOrderTypes.DataBind();
//this.selOrderTypes.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- //this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
- //this.selPayStates.DataBind();
- //this.selPayStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
+ this.selPayStates.DataBind();
+ this.selPayStates.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selPayStates.Value = "0";
//this.selOrderStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鐘舵��").Where(p => p.MeanValue.Value != -5 && p.MeanValue.Value != -4);
//this.selOrderStates.DataBind();
@@ -535,10 +536,10 @@
SetParamValue(searchParam, 3, this.txtCustormerName.Value.Trim());
SetParamValue(searchParam, 4, this.txtBeginData.Value.Trim());
SetParamValue(searchParam, 5, this.txtEndDate.Value.Trim());
- SetParamValue(searchParam, 6, this.selPrintTypes.Value);
+ SetParamValue(searchParam, 6, ""); //this.selPrintTypes.Value
SetParamValue(searchParam, 7, "");//this.selOrderTypes.Value
SetParamValue(searchParam, 8, "");//this.selOrderStates.Value
- SetParamValue(searchParam, 9, "");//this.selPayStates.Value
+ SetParamValue(searchParam, 9, this.selPayStates.Value);
SetParamValue(searchParam, 10, this.txtCreaterName.Value.Trim());
SetParamValue(searchParam, 11, "");//this.selCustormerLevels.Value
SetParamValue(searchParam, 12, this.selCustormerManager.Value);
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 8458778..6f5ea9d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
@@ -69,15 +69,6 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
/// <summary>
- /// selPrintTypes 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
-
- /// <summary>
/// txtCreaterName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -114,6 +105,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
/// <summary>
+ /// selPayStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
index 3553648..99c4e08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx
@@ -13,6 +13,10 @@
<td class="ali03 w100px">瀹㈡埛鍚嶇О锛�</td>
<td><span id="khname" runat="server"></span></td>
</tr>
+ <tr>
+ <td class="ali03 w100px">璁㈠崟鏁伴噺锛�</td>
+ <td><span id="Dingdanshu" runat="server"></span></td>
+ </tr>
<tr>
<td class="ali03">寮�绁ㄩ噾棰濓細</td>
<td><span id="kpmoney" runat="server"></span></td>
@@ -42,7 +46,7 @@
</tr>
<tr id="trbtn" runat="server">
<td class="ali02" colspan="2">
- <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_form" />
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
<span style="margin-left:10px"></span>
<input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
index df66488..b5fce9b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.cs
@@ -93,6 +93,7 @@
//}
kpmoney.InnerText = total.ToString("0.00");
khname.InnerText = name;
+ Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
}
else
{
@@ -205,7 +206,7 @@
m_OA_WorkPlan.LastUpdateTime = nowTime;
oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
}
-
+ oA_DeliverPlan.Shenqingleixing = "璁㈠崟寮�绁�";
oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
oA_DeliverPlan.CreateTime = DateTime.Now;
oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
index f88cdc0..682b09c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoConfirm.aspx.designer.cs
@@ -33,6 +33,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl khname;
/// <summary>
+ /// Dingdanshu 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Dingdanshu;
+
+ /// <summary>
/// kpmoney 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx
new file mode 100644
index 0000000..fc1f031
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx
@@ -0,0 +1,102 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="kaipiaoKehu.aspx.cs" Inherits="CY.WebForm.Pages.business.kaipiaoKehu" %>
+
+<!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">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+ <tr>
+ <td class="ali03 w100px">瀹㈡埛鍚嶇О锛�</td>
+ <td><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select></td>
+ </tr>
+
+
+ <tr>
+ <td class="ali03">寮�绁ㄩ噾棰濓細</td>
+ <td> <input id='txtkpmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ュ紑绁ㄩ噾棰�" /></td>
+ </tr>
+
+
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ <script type="text/javascript" language="javascript">
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^[0-9]+(\.[0-9]{1,2})?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑閲戦锛屼緥濡� 123 鎴� 45.67');
+ }
+ }
+
+ //涓篠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;'/><span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">鏂板瀹㈡埛</span>";
+ $(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);
+ });
+ });
+ }
+
+ ///鏂板瀹㈡埛
+ function showCustomer() {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 1200, Height: 780 });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.cs
new file mode 100644
index 0000000..27ce602
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.cs
@@ -0,0 +1,183 @@
+锘縰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.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.business
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class kaipiaoKehu : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ OA_CorporateClientsBLL _oA_CorporateClientsBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+
+
+ //鍒濆鍖�
+ public kaipiaoKehu()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
+ _oA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+
+
+
+
+
+
+ IList<OA_CorporateClients> corporateClients = _oA_CorporateClientsBLL.SelectListByFirmId(CurrentUser.MemberId) as IList<OA_CorporateClients>;
+ if (null != corporateClients)
+ {
+ corporateClients.Where(cc => CurrentUser.MemberId.Equals(cc.MemberId) && corporateClients.Remove(cc));
+ }
+ this.selCustormer.DataSource = corporateClients;
+ this.selCustormer.DataBind();
+ this.selCustormer.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ txtkpmoney.Value = "";
+
+
+
+
+
+
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+
+ if (string.IsNullOrEmpty(this.selCustormer.Value))
+
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("璇烽�夋嫨瀹㈡埛", this);
+ return;
+ }
+
+ if ( this.txtkpmoney.Value.ToDecimal2()<=0)
+
+ {
+ //鎿嶄綔澶辫触
+ JavaScript.MessageBox("璇峰～鍐欏紑绁ㄩ噾棰�", this);
+ return;
+ }
+
+
+ OA_CorporateClients oA_CorporateClient = _oA_CorporateClientsBLL.GetModel(this.selCustormer.Value.ToGuid2());
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ string ssss = DateTime.Now.ToString("yyyyMMdd");
+ string SellerOrderId = ssss + 1.ToString("000");
+
+ string maxSellerOrderId = _oA_KaipiaoshenqingBLL.GetModelByformid(CurrentUser.MemberId).Where(x => x.SellerOrderId.Contains(ssss)).Max(x => x.SellerOrderId);
+ if (!string.IsNullOrWhiteSpace(maxSellerOrderId))
+ {
+ string aaaaaaaaaaaa = maxSellerOrderId.Substring(maxSellerOrderId.Length - 3, 3);
+ SellerOrderId = ssss + (aaaaaaaaaaaa.ToInt32().Value + 1).ToString("000");
+ }
+ OA_Kaipiaoshenqing oA_DeliverPlan = new OA_Kaipiaoshenqing();
+
+
+ oA_DeliverPlan.Keyid = Guid.NewGuid();
+ oA_DeliverPlan.FirmId = CurrentUser.MemberId;
+ oA_DeliverPlan.BuyerId = this.selCustormer.Value.ToGuid2();
+ oA_DeliverPlan.Kaipiaoshenqing = 1;
+ oA_DeliverPlan.Kehuqianshou = 1;
+ oA_DeliverPlan.SellerOrderId = SellerOrderId;
+ oA_DeliverPlan.remark = "";//.Replace("\r\n", "<br>");
+
+ oA_DeliverPlan.KehuqianshouTime = null;
+ oA_DeliverPlan.KehuqianshouCreater = null;
+ oA_DeliverPlan.KaipiaoquerenTime = null;
+ oA_DeliverPlan.KaipiaoquerenCreater = null;
+ oA_DeliverPlan.BusinessManagerId = oA_CorporateClient.BusinessManagerId;
+ oA_DeliverPlan.Zengjianmoney = 0;
+ oA_DeliverPlan.kpmoney = this.txtkpmoney.Value.ToDecimal2();
+ oA_DeliverPlan.ApprovalStatus = 1;
+ oA_DeliverPlan.Dingdanshu = 0;
+
+ oA_DeliverPlan.Shenqingleixing = "棰勪粯娆惧紑绁�";
+ oA_DeliverPlan.Creater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.CreateTime = DateTime.Now;
+ oA_DeliverPlan.Updater = CurrentUser.TrueMemberId;
+ oA_DeliverPlan.LastUpdateTime = DateTime.Now;
+ bool result = true;
+ result = _oA_KaipiaoshenqingBLL.InsertModel(oA_DeliverPlan);
+
+
+
+ if (!result)
+ {
+ return;
+ }
+ //}
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBoxsssss("鎻愪氦鎴愬姛", this, true, true);
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.designer.cs
new file mode 100644
index 0000000..6e6a14d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/kaipiaoKehu.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class kaipiaoKehu
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// selCustormer 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormer;
+
+ /// <summary>
+ /// txtkpmoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtkpmoney;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx
new file mode 100644
index 0000000..b805227
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx
@@ -0,0 +1,214 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DepositsCustomerFapiao.aspx.cs" Inherits="CY.WebForm.Pages.financial.DepositsCustomerFapiao" %>
+
+<!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 language="javascript" type="text/javascript">
+ function ChangeThisType(obj) {
+ $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+ $.ajax({
+ url: "/Pages/financial/FirmAccountExpensesEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), DataType: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selAccountName"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ ChangeThisType("#selAcoountType");
+ });
+ </script>
+</head>
+<body>
+ <form id="form1" runat="server" class="form">
+ <div id="scrollContent">
+ <div class="box">
+ <table class="tableStyle">
+ <tr>
+ <td class="ali03 ">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <span id="spanCustomName" runat="server"></span>
+ </td>
+ <td class="ali03 ">
+ 棰勪粯娆句綑棰濓細
+ </td>
+ <td>
+ <span id="spanCustomMoney" runat="server" class="moneystyle"></span>
+ </td>
+ <td class="ali03 ">
+ 鍙戠エ鍙凤細
+ </td>
+ <td>
+ <span id="spanFapiaohao" runat="server" class="moneystyle"></span>
+ </td>
+
+
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鍙戠エ閲戦锛�
+ </td>
+ <td>
+ <span id="spankpmoney" runat="server" class="moneystyle"></span>
+ </td>
+ <td class="ali03 ">
+ 宸插瓨閲戦锛�
+ </td>
+ <td>
+ <span id="spanKehumoney" runat="server" class="moneystyle"></span>
+ </td>
+ <td class="ali03 ">
+ 瀛樺叆閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtOperatMoney" type="text" class="w80px req float" maxlength="18" />
+ </td>
+ </tr>
+ <tr>
+ <%--<td class="ali03 ">绉戠洰鍚嶇О锛�</td><td><select class="Sreq" id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepDefaultStyle="true"></select></td>--%>
+ <td class="ali03 ">
+ 璐︽埛绫诲瀷锛�
+ </td>
+ <td>
+ <select id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true">
+ </select>
+ </td>
+ <td class="ali03 ">
+ 璐︽埛鍚嶇О锛�
+ </td>
+ <td colspan="3">
+ <select class="Sreq w143px" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 澶囨敞锛�
+ </td>
+ <td colspan="5">
+ <textarea runat="server" id="txtRemark" style="width: 400px; height: 50px;"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ </td>
+ <td colspan="5">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_Deposits" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="box" style="margin-top: 10px;">
+ <table class="tableStyle">
+ <tr>
+ <td class="ali03">
+ 澶勭悊鏃堕棿:
+ </td>
+ <td>
+ <input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />-<input id="txtRegTimeEnd" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
+ </td>
+ <td class="ali03">
+ 閲戦锛�
+ </td>
+ <td>
+ <input id="spanMoneyw" runat="server" class="moneystyle" type="text" />
+ </td>
+ <td>
+ <asp:Button ID="btn_Query" Text="妫�绱�" runat="server" OnClick="btn_Query_Deposits" />
+ </td>
+ </tr>
+ </tr>
+ </table>
+ </div>
+ <div class="box5">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle ali02" useclick="false" usecheckbox="true" sortmode="true">
+ <tr>
+ <%--<th width="25"></th>--%>
+ <th>
+ 缂栧彿
+ </th>
+ <%--<th>鎿嶄綔绫诲瀷</th>--%>
+ <th>
+ 鎿嶄綔閲戦
+ </th>
+ <%--<th>绉戠洰鍚嶇О</th>--%>
+ <th>
+ 璐︽埛绫诲瀷
+ </th>
+ <th>
+ 璐︽埛鍚�
+ </th>
+ <th>
+ 鎿嶄綔浜�
+ </th>
+ <th>
+ 澶囨敞
+ </th>
+ <th>
+ 鎿嶄綔鏃堕棿
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <%--<td><input type="checkbox" class="SelectCheck" /></td>--%>
+ <td>
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <%--<td><%#Eval("OperatTypeId")%></td>--%>
+ <td>
+ <%#Eval("OperatMoney", "{0:F2}")%>
+ </td>
+ <%-- <td><%#Eval("SubjectName")%></td>--%>
+ <td>
+ <%#Eval("AccountType")%>
+ </td>
+ <td>
+ <%#Eval("AccountName")%>
+ </td>
+ <td>
+ <%#Eval("Operator")%>
+ </td>
+ <td title="<%#Eval("Remark")%>">
+ <%#Eval("Remark").ToString().Length > 10 ? Eval("Remark").ToString().Substring(0,10) : Eval("Remark")%>
+ </td>
+ <td>
+ <%#Eval("LastUpdateTime")%>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs
new file mode 100644
index 0000000..d47b9dc
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs
@@ -0,0 +1,208 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.financial
+{
+ //鍚磋緣
+ //瀹㈡埛棰勪粯娆惧瓨鍏�
+ public partial class DepositsCustomerFapiao : BasePage
+ {
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_AdvanceMoneyRecordBLL bll_OA_AdvanceMoneyRecordBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+ OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+ OA_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = null;
+
+ //鍒濆鍖�
+ public DepositsCustomerFapiao()
+ {
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ bll_OA_AdvanceMoneyRecordBLL = new OA_AdvanceMoneyRecordBLL();
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+ _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ BindList();
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ try
+ {
+ //绉戠洰鍚嶇О
+ //selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "鍊�");
+ //selSubject.DataBind();
+ //selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var shenqid = Request["Keyid"].ToGuid2();
+ var kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(shenqid);
+ //璐︽埛绫诲瀷
+ this.selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+ this.selAcoountType.DataBind();
+
+ //璐︽埛淇℃伅
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModel(kaipiaoshenqing.BuyerId);
+ this.spanCustomName.InnerText = m_OA_CorporateClients.CompanyName;
+ this.spanCustomMoney.InnerText = "锟� " + m_OA_CorporateClients.Prepayments.ToDecimal2Yen();
+
+ this.spanFapiaohao.InnerText = kaipiaoshenqing.Fapiaohao;
+ this.spankpmoney.InnerText = "锟� " + kaipiaoshenqing.kpmoney.ToDecimal2Yen();
+ this.spanKehumoney.InnerText = "锟� " + kaipiaoshenqing.Kehumoney.ToDecimal2Yen();
+
+ var kpmoney = kaipiaoshenqing.kpmoney.HasValue ? kaipiaoshenqing.kpmoney.Value:0;
+ var Kehumoney = kaipiaoshenqing.Kehumoney.HasValue ? kaipiaoshenqing.Kehumoney.Value : 0;
+ this.txtOperatMoney.Value = (kpmoney - Kehumoney).ToString();
+
+ //鍒嗛〉淇℃伅
+ Pagination pa = new Pagination();
+ DateTime? beginTime = null;
+ DateTime? endTime = null;
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ this.RepClientList.DataSource = bll_OA_AdvanceMoneyRecordBLL.GetModelPageListForCustomer(pa, kaipiaoshenqing.BuyerId,
+ string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value),
+ string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value),
+ spanMoneyw.Value.ToString());
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ }
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鎻愪氦琛ㄥ崟
+ protected void btn_Submit_Deposits(object sender, EventArgs e)
+ {
+ try
+ {
+
+ var shenqid = Request["Keyid"].ToGuid2();
+ var kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(shenqid);
+ int? SubjectId = 0; // 瀹㈡埛棰勪粯娆�
+ string AccountType = this.selAcoountType.Value.ToString2();
+ int? AccountId = Request["selAccountName"].ToInt32();
+ decimal? money = this.txtOperatMoney.Value.ToDecimal2();
+ if (SubjectId == null || string.IsNullOrEmpty(AccountType) || AccountId == null || money == null)
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ else
+ {
+ var kpmoney = kaipiaoshenqing.kpmoney.HasValue ? kaipiaoshenqing.kpmoney.Value : 0;
+ var Kehumoney = kaipiaoshenqing.Kehumoney.HasValue ? kaipiaoshenqing.Kehumoney.Value : 0;
+ if (money<=0)
+ {
+ JavaScript.MessageBox("璇峰～鍐欏瓨鍏ラ噾棰�", this);
+ return;
+ }
+ if (money > (kpmoney -Kehumoney))
+ {
+ JavaScript.MessageBox("鏈瀛樺叆閲戦澶т簬瀹㈡埛鏈粯娆�", this);
+ return;
+ }
+
+
+ //OA_SubjectSet m_OA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(SubjectId);
+
+ OA_FirmAccount m_OA_FirmAccount = _OA_FirmAccountBLL.getSingleSubject(AccountId);
+ if (money > 0)
+ {
+ m_OA_FirmAccount.AllIncome += money;
+ }
+ else
+ {
+ m_OA_FirmAccount.AllExpenses += money;
+ }
+ m_OA_FirmAccount.Balance += money;
+ m_OA_FirmAccount.LastUpdateTime = DateTime.Now;
+ m_OA_FirmAccount.Operator = CurrentUser.ShortName;
+
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModel(kaipiaoshenqing.BuyerId);
+ m_OA_CorporateClients.Prepayments += money;
+ m_OA_CorporateClients.Operator = CurrentUser.ShortName;
+ m_OA_CorporateClients.LastUpdateTime = DateTime.Now;
+
+ OA_FirmAccountRecord m_OA_FirmAccountRecord = new OA_FirmAccountRecord();
+ m_OA_FirmAccountRecord.AccountId = m_OA_FirmAccount.Keyid;
+ m_OA_FirmAccountRecord.RecordTypeId = money > 0 ? 1 : 2;//鏀跺叆
+ m_OA_FirmAccountRecord.Money = Math.Abs(money.Value);
+ m_OA_FirmAccountRecord.SubjectId = 0;
+ m_OA_FirmAccountRecord.OperationalMatters = money > 0 ? "瀹㈡埛棰勪粯娆惧瓨鍏�" : "瀹㈡埛棰勪粯娆惧瓨鍏�(璐�)";
+ m_OA_FirmAccountRecord.PaymentUnit = m_OA_CorporateClients.CompanyName;
+ m_OA_FirmAccountRecord.LastUpdateTime = DateTime.Now;
+ m_OA_FirmAccountRecord.Operator = CurrentUser.ShortName.ToString2();
+ m_OA_FirmAccountRecord.Remark = this.txtRemark.Value.ToString2();
+ m_OA_FirmAccountRecord.ResidualAmount = m_OA_FirmAccount.Balance;
+ m_OA_FirmAccountRecord.Department = "";
+
+ OA_AdvanceMoneyRecord m_OA_AdvanceMoneyRecord = new OA_AdvanceMoneyRecord();
+ m_OA_AdvanceMoneyRecord.CustomerId = m_OA_CorporateClients.Keyid;
+ m_OA_AdvanceMoneyRecord.OperatTypeId = _Sys_DictionaryBLL.GetNameByMeanValue(1, "瀹㈡埛棰勪粯娆炬槑缁嗙被鍨�");
+ m_OA_AdvanceMoneyRecord.OperatMoney = money;
+ m_OA_AdvanceMoneyRecord.SubjectName = money > 0 ? "棰勪粯娆炬敹鍏�" : "棰勪粯娆炬敹鍏�(璐�)";
+ m_OA_AdvanceMoneyRecord.AccountType = AccountType;
+ m_OA_AdvanceMoneyRecord.AccountName = m_OA_FirmAccount.AccountName + "-" + m_OA_FirmAccount.UserName;
+ m_OA_AdvanceMoneyRecord.LastUpdateTime = DateTime.Now;
+ m_OA_AdvanceMoneyRecord.Operator = CurrentUser.ShortName.ToString2();
+ m_OA_AdvanceMoneyRecord.Remark = this.txtRemark.Value.ToString2();
+
+ kaipiaoshenqing.Kehumoney = Kehumoney + money.Value;
+ var sss = oA_KaipiaoshenqingBLL.UpdateModel(kaipiaoshenqing);
+ if (bll_OA_AdvanceMoneyRecordBLL.DepositsMoney(m_OA_FirmAccount, m_OA_CorporateClients, m_OA_FirmAccountRecord, m_OA_AdvanceMoneyRecord))
+ {
+ BindList();
+ JavaScript.MessageBox("瀛樺叆鎴愬姛", this, true, true);
+ }
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+
+ protected void btn_Query_Deposits(object sender, EventArgs e)
+ {
+ try
+ {
+ BindList();
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.designer.cs
new file mode 100644
index 0000000..738fa47
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.designer.cs
@@ -0,0 +1,179 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class DepositsCustomerFapiao
+ {
+
+ /// <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>
+ /// spanCustomName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCustomName;
+
+ /// <summary>
+ /// spanCustomMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCustomMoney;
+
+ /// <summary>
+ /// spanFapiaohao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanFapiaohao;
+
+ /// <summary>
+ /// spankpmoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spankpmoney;
+
+ /// <summary>
+ /// spanKehumoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanKehumoney;
+
+ /// <summary>
+ /// txtOperatMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtOperatMoney;
+
+ /// <summary>
+ /// selAcoountType 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+ /// <summary>
+ /// selAccountName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// txtRegTimeStart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
+
+ /// <summary>
+ /// txtRegTimeEnd 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
+
+ /// <summary>
+ /// spanMoneyw 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText spanMoneyw;
+
+ /// <summary>
+ /// btn_Query 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Query;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
--
Gitblit v1.9.1