From 529d8cb61421eb65d86559d3d2636ad405b87b41 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 22 七月 2025 08:50:06 +0800
Subject: [PATCH] 专版 四色 八色 自翻印刷的时候 ctp 4张 扣版 8张
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 62 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 7
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 8
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 35 +++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 18 +
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs | 26 ++
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.designer.cs | 65 +++--
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FirmAccountRecordDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 7
CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs | 20 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx | 18 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs | 3
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx | 17 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs | 83 ++++++-
CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 49 ++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 22 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 54 ++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs | 20 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx | 8
31 files changed, 529 insertions(+), 73 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
index 0c1298d..10ed29d 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
@@ -73,6 +73,16 @@
}
/// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_WorkPlan GetModelByFukuanshenqid(string PlanComplany, string RewardType)
+ {
+ return iOA_WorkPlanDAL.GetModelByFukuanshenqid(PlanComplany, RewardType);
+ }
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="pagination"></param>
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
index ff1850f..b162830 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
@@ -29,6 +29,13 @@
OA_WorkPlan GetModelByKeyid(int? Keyid);
/// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_WorkPlan GetModelByFukuanshenqid(string PlanComplany,string RewardType);
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="pagination"></param>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs b/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
index 6366ecf..979a937 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_SpecialForums.cs
@@ -59,6 +59,8 @@
public string shifouxianshiheban { get; set; }
+ public string shifouqitadingdan { get; set; }
+
/// <summary>
/// 涓婚敭--鏍囪瘑ID
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
index e69afdf..ff35da5 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Fukuanshenqing.cs
@@ -154,8 +154,10 @@
get;
set;
}
-
-
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public string WorkPlanId { get; set; }
#endregion Model
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FirmAccountRecordDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FirmAccountRecordDAL.cs
index b8d9d82..a5f9632 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FirmAccountRecordDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FirmAccountRecordDAL.cs
@@ -195,7 +195,7 @@
fromSource += string.Format(" and a.PaymentUnit like '%{0}%'", PaymentUnit);
}
- return _dataBase.SelectModelPage<Model.OA_FirmAccountRecord>(pa, target, fromSource, "a.LastUpdateTime DESC");
+ return _dataBase.SelectModelPage<Model.OA_FirmAccountRecord>(pa, target, fromSource, "a.Keyid DESC");
}
catch (Exception ex)
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index 71fd4e7..e9829ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -275,6 +275,41 @@
}
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_WorkPlan GetModelByFukuanshenqid(string PlanComplany, string RewardType)
+ {
+ try
+ {
+ string condi = "";
+ if (!string.IsNullOrEmpty(PlanComplany))
+ {
+ condi = " a.PlanComplany = '"+ PlanComplany + "' ";
+ }
+ else if (!string.IsNullOrEmpty(RewardType))
+ {
+ condi = " a.RewardType = '" + RewardType + "' ";
+ }
+ else
+ {
+ return null;
+ }
+
+ IList<OA_WorkPlan> result = _dataBase.SelectModel<OA_WorkPlan>(" a.* ", " OA_WorkPlan a ", condi) as IList<OA_WorkPlan>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
/// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 822f6fc..a7a6d59 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -151,6 +151,29 @@
document.getElementById('PrintSizeName').value = "";
}
}
+
+
+ $("#PSF_Typesetting").live("change", function () {
+
+ if ($("#selPMS_Machine").val().indexOf('鍏紑') >= 0 || $("#selPMS_Machine").val().indexOf('榛戠櫧') >= 0) {
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("2");
+ } else {
+ $("#CTPCount").val("1");
+ }
+ }
+
+ if ($("#selPMS_Machine").val().indexOf('鍥涜壊') >= 0 || $("#selPMS_Machine").val().indexOf('鍏壊') >= 0) {
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("8");
+ } else {
+ $("#CTPCount").val("4");
+ }
+ }
+
+
+ });
+
/*
浜ゆ槗瀹㈡埛閫変腑鍊煎彂鐢熸敼鍙�
*/
@@ -161,20 +184,36 @@
if (sel.value.indexOf('鍏紑') >= 0) {
document.getElementById('PlateSpec').value = '395*460';
document.getElementById('PMS_ChromaticNumber').value = '1';
- document.getElementById('CTPCount').value = '1';
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("2");
+ } else {
+ $("#CTPCount").val("1");
+ }
} else if (sel.value.indexOf('鍥涜壊') >= 0) {
document.getElementById('PlateSpec').value = '770*1030';
document.getElementById('PMS_ChromaticNumber').value = '4';
- document.getElementById('CTPCount').value = '4';
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("8");
+ } else {
+ $("#CTPCount").val("4");
+ }
} else if (sel.value.indexOf('鍏壊') >= 0) {
document.getElementById('PlateSpec').value = '790*1030';
document.getElementById('PMS_ChromaticNumber').value = '4';
- document.getElementById('CTPCount').value = '4';
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("8");
+ } else {
+ $("#CTPCount").val("4");
+ }
} else if (sel.value.indexOf('榛戠櫧') >= 0) {
document.getElementById('PlateSpec').value = '760*920';
document.getElementById('PMS_ChromaticNumber').value = '1';
- document.getElementById('CTPCount').value = '2';
+ if ($("#PSF_Typesetting").val() == "鎵ｇ増") {
+ $("#CTPCount").val("2");
+ } else {
+ $("#CTPCount").val("1");
+ }
} else if (sel.value.indexOf('杞浆') >= 0) {
document.getElementById('PlateSpec').value = '579*810';
document.getElementById('PMS_ChromaticNumber').value = '1';
@@ -403,7 +442,7 @@
<select keepDefaultStyle="true" name="PSF_Typesetting" id="PSF_Typesetting" runat = "server" style="width:80px">
<option value="鑷炕">鑷炕</option>
<option value="婊氱炕">婊氱炕</option>
- <option value="鎵ｆ澘">鎵ｆ澘</option>
+ <option value="鎵ｇ増">鎵ｇ増</option>
<option value="鍗曢潰">鍗曢潰</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 83f53db..5f8e975 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -432,6 +432,13 @@
</tbody>
</table>
<uc:UCPager ID="UCPager1" runat="server" />
+ <select keepdefaultstyle='true' id='ddlPageSize' runat="server" style="float:right;margin-top:10px;" >
+ <option value="25">25鏉�/椤�</option>
+ <option value="50">50鏉�/椤�</option>
+ <option value="100">100鏉�/椤�</option>
+ <option value="200">200鏉�/椤�</option>
+ </select>
+ <div style="height:100px;"></div>
</div>
</div>
</form>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
index 2a4ea7c..34adbde 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -129,8 +129,9 @@
private void BindList()
{
Pagination pa = new Pagination();
- pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ pa.PageSize = this.ddlPageSize.Value.ToInt32().Value;// UCPager1.AspNetPager.PageSize;
+ UCPager1.AspNetPager.PageSize = this.ddlPageSize.Value.ToInt32().Value;
this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4,this.selPayStates.Value);
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
index 52193b6..bc020ba 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
@@ -148,5 +148,14 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+
+ /// <summary>
+ /// ddlPageSize 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ddlPageSize;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 2492ef0..2b236a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -386,6 +386,14 @@
<td colspan="6">
</td>
</tr>
+ <tr style="<%#Eval("shifouqitadingdan")%>">
+ <td style="font-weight: bold; background-color: #E6E6E6;">
+ 鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
+ </td>
+ <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
+ <%#Eval("PSF_PaperName")%>
+ </td>
+ </tr>
<tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
<td style="font-weight: bold; background-color: #E6E6E6;">
娉ㄦ剰浜嬮」锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index 2ecd03f..f3075f6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -182,6 +182,11 @@
{
eC_SpecialForums.shifouxianshi = "display:none;";
eC_SpecialForums.shifouxianshiheban = "display:none;";
+ eC_SpecialForums.shifouqitadingdan = "display:;";
+ }
+ else
+ {
+ eC_SpecialForums.shifouqitadingdan = "display:none;";
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index cb0728e..741390c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -261,7 +261,7 @@
<select keepdefaultstyle="true" class="" name="PSF_Typesetting" value_ppwaerid="<%#Container.ItemIndex + 1%>">
<option value="鑷炕">鑷炕</option>
<option value="婊氱炕">婊氱炕</option>
- <option value="鎵ｆ澘">鎵ｆ澘</option>
+ <option value="鎵ｇ増">鎵ｇ増</option>
<option value="鍗曢潰">鍗曢潰</option>
</select>
@@ -431,6 +431,14 @@
<td colspan="7">
</td>
</tr>
+ <tr class="PSF_Qitadingdanhao" value_ppwaerid='<%#Container.ItemIndex + 1%>' style="display:none;">
+ <td style="font-weight: bold; background-color: #E6E6E6;">
+ 鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
+ </td>
+ <td colspan="12" align="left" >
+ <input type="text" name="PSF_Qitadingdanhao" style="width: 50%;" value_ppwaerid="<%#Container.ItemIndex + 1%>"value="<%#Eval("PSF_PaperName")%>" maxlength="50" />
+ </td>
+ </tr>
<tr>
<td style="font-weight: bold; background-color: #E6E6E6;">
娉ㄦ剰浜嬮」锛�
@@ -586,6 +594,8 @@
$(".CTPSpecName").last().attr("value_ppwaerid", value_id + 1);
$(".CTPCount").last().attr("value_ppwaerid", value_id + 1);
$(".lbCTPCount").last().attr("value_ppwaerid", value_id + 1);
+ $(".PSF_Qitadingdanhao").last().attr("value_ppwaerid", value_id + 1);
+ $("input[name='PSF_Qitadingdanhao']").last().attr("value_ppwaerid", value_id + 1);
$("select[name='PSF_Component']").last().attr("value_ppwaerid", value_id + 1);
$("input[name='PSF_PNum']").last().attr("value_ppwaerid", value_id + 1);
$(".tdCTPCount").last().attr("value_ppwaerid", value_id + 1);
@@ -775,10 +785,18 @@
$("select[name='PSF_Typesetting']").live("change", function () {
var value_SelWaerId = $(this).attr("value_ppwaerid");
if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏紑') >= 0 || $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('榛戠櫧') >= 0) {
- if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｆ澘") {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
} else {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
+ }
+ }
+
+ if ($("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍥涜壊') >= 0 || $("select[name='PSF_PressesDesk'][value_selspec='" + value_SelWaerId + "']").val().indexOf('鍏壊') >= 0) {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+ } else {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
}
}
@@ -819,8 +837,9 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
- if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｆ澘") {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
} else {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
@@ -857,8 +876,14 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ //$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+ } else {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ }
}
else if ($(this).val().indexOf('鍏壊') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍥涜壊");
@@ -890,8 +915,14 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ // $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
+ } else {
+ $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("4");
+ }
}
else if ($(this).val().indexOf('榛戠櫧') >= 0) {
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
@@ -923,9 +954,10 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
- if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｆ澘") {
+ if ($("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").val() == "鎵ｇ増") {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
} else {
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("1");
@@ -965,6 +997,7 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
}
@@ -1070,6 +1103,7 @@
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
@@ -1109,6 +1143,7 @@
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("");
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
@@ -1226,6 +1261,7 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
@@ -1254,6 +1290,7 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
else if ($(vv).val().indexOf('鍏壊') >= 0) {
@@ -1282,6 +1319,7 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
else if ($(vv).val().indexOf('榛戠櫧') >= 0) {
@@ -1310,6 +1348,7 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
// $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
}
@@ -1343,6 +1382,7 @@
$("tr[name='PSF_PrintedPaperTdtrtr'][value_selspec='" + value_SelWaerId + "']").show();
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
}
@@ -1357,6 +1397,7 @@
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
@@ -1390,6 +1431,7 @@
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").hide();
+ $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 3c1d0f5..d80b363 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -378,6 +378,7 @@
string[] PSF_BigPaperCount = Request["PSF_BigPaperCount"].ToString2().Split(',');
string[] PSF_OpenSpecifications = Request["PSF_OpenSpecifications"].ToString2().Split(',');
+ string[] PSF_Qitadingdanhao = Request["PSF_Qitadingdanhao"].ToString2().Split(',');
string[] PSF_OpenWidth = Request["PSF_OpenWidth"].ToString2().Split(',');
string[] PSF_OpenWidthName = Request["PSF_OpenWidthName"].ToString2().Split(',');
string[] PSF_OpenLength = Request["PSF_OpenLength"].ToString2().Split(',');
@@ -507,7 +508,12 @@
//}
m_EC_SpecialForums.PSF_BigPaperCount = 0;
m_EC_SpecialForums.PSF_OpenSpecifications = PSF_OpenSpecifications[i].ToString2().Replace("锛�+-+锛�", ",");
- if (PSF_PressesDesk[i].IndexOf("杞浆")>=0 || PSF_PressesDesk[i].IndexOf("榛戠櫧") >= 0)
+
+ if (PSF_PressesDesk[i].IndexOf("涓庡叾浠栬鍗曞悎鐗�") >= 0 )
+ {
+ m_EC_SpecialForums.PSF_PaperName = PSF_Qitadingdanhao[i];
+ }
+ if (PSF_PressesDesk[i].IndexOf("杞浆") >= 0 || PSF_PressesDesk[i].IndexOf("榛戠櫧") >= 0)
{
if (PSF_OpenWidthName[i].ToInt32() == null)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index 2cf2dc5..1064da4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -73,6 +73,13 @@
// top.Dialog.open({ URL: '/Pages/business/WaixiefukuanfukuanEdit.aspx?id=' + ids, Title: '鎵归噺纭鍙戠エ', Height: 400, Width: 600 });
// }
//}
+
+ //璇风ず鏄庣粏
+ function onViewWorkPlan(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyRequestDetail.aspx?keyid=" + keyid, Title: "璇风ず鏄庣粏", Width: 620, Height: 360 });
+ }
+
+
//鏌ョ湅瀹㈡埛璧勬枡
function Viewkehuqianshou(Keyid, SellerOrderId) {
top.Dialog.open({ URL: "/Pages/business/OrderKehuqianshou.aspx?id=" + Keyid + "&SellerOrderId=" + SellerOrderId, Title: "瀹㈡埛绛炬敹", Width: 400, Height: 600 });
@@ -293,7 +300,9 @@
<th width="36">
璁㈠崟
</th>
-
+ <th width="60">
+ 瀹℃壒鏌ョ湅
+ </th>
<th width="60">
鎿嶄綔
@@ -367,7 +376,12 @@
</td>
-
+ <td>
+
+ <a href='javascript:void(0)' title='瀹℃壒鏌ョ湅' class='a_under' onclick='onViewWorkPlan("<%#Eval("WorkPlanId")%>")'> 瀹℃壒鏌ョ湅 </a>
+
+
+ </td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index 23a4ea2..468178e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -39,6 +39,7 @@
LF_OrderFileBLL _lF_OrderFileBLL = null;
EC_OrderBLL _eC_OrderBLL = null;
OA_FukuanshenqingBLL oA_FukuanshenqingBLL = null;
+ OA_WorkPlanBll _WorkPlanBll = null;
/// <summary>
/// 鍒濆鍖栨瀯閫�
@@ -50,6 +51,7 @@
_lF_OrderFileBLL = new LF_OrderFileBLL();
_eC_OrderBLL = new EC_OrderBLL();
oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _WorkPlanBll = new OA_WorkPlanBll();
}
/// <summary>
@@ -558,6 +560,30 @@
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
+ foreach(var oA_Fukuanshenqing in result)
+ {
+ if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻")
+ {
+ var workPlan = _WorkPlanBll.GetModelByFukuanshenqid(oA_Fukuanshenqing.Keyid.ToString(),"");
+ if (workPlan != null)
+ {
+ oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+ }
+ }
+ else if (oA_Fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" )
+ {
+ var workPlan = _WorkPlanBll.GetModelByFukuanshenqid( "", oA_Fukuanshenqing.Keyid.ToString());
+ if (workPlan != null)
+ {
+ oA_Fukuanshenqing.WorkPlanId = workPlan.Keyid.ToString();
+ }
+ }
+ else
+ {
+ oA_Fukuanshenqing.WorkPlanId = "";
+ }
+ }
+
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
index 1c44dd6..46444d5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx
@@ -32,6 +32,12 @@
}
+ function molinya() {
+ var sss = $("#hidReceiveMoney").val() - $("#txtMolingMoney").val()
+ $("#txtReciveMoney").val(sss);
+
+ }
+
function ChangeThisSubject(obj) {
@@ -87,6 +93,7 @@
</td>
<td>
<span class="moneystyle" id="spanReceiveMoney" runat="server">锟�</span>
+ <input type="hidden" id="hidReceiveMoney" runat="server" />
</td>
</tr>
<tr>
@@ -136,10 +143,18 @@
鏀跺彇閲戦锛�
</td>
<td title="褰撳崟涓粯娆炬椂鍙儴鍒嗕粯娆�">
- <asp:TextBox TextMode="SingleLine" id="txtReciveMoney" runat="server" class="req float" min="0"></asp:TextBox>
+ <input runat="server" id="txtReciveMoney" class="req float" maxlength="18" min="0" readonly="readonly" ></input>
</td>
</tr>
<tr>
+ <td class="ali03 ">
+ 鎶归浂閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" onchange="molinya();" />(鍏�)
+ </td>
+ </tr>
+ <tr>
<td class="ali03 ">
鏈夋棤鍙戠エ锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
index 0a99c4f..ba2e66b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.cs
@@ -96,10 +96,11 @@
}
this.spanAllMoney.InnerHtml = "锟�" + (AllMoney ?? 0).ToString("0.00");
this.spanReceiveMoney.InnerHtml = "锟�" + ReceiveMoney.Value.ToString("0.00");
+ this.hidReceiveMoney.Value = ReceiveMoney.Value.ToString();
this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
- this.txtReciveMoney.Enabled = false;
- this.txtReciveMoney.Text = (ReceiveMoney ?? 0).ToString("0.00");
+
+ this.txtReciveMoney.Value = (ReceiveMoney ?? 0).ToString("0.00");
this.txtReciveMoney.Attributes.Add("max", (ReceiveMoney ?? 0).ToString("0.00"));
}
@@ -119,14 +120,12 @@
JavaScript.MessageBox("璇烽�夋嫨璐︽埛", this);
return;
}
- ReceiveMoney = this.txtReciveMoney.Text.ToDecimal2();
+ var werwerwerwerwe = Request["txtReciveMoney"];
+ ReceiveMoney = this.txtReciveMoney.Value.ToDecimal2();
int? SubjectId = this.selSubject.Value.ToInt32();
-
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
decimal? money = ReceiveMoney;
- if (Request["amount"].ToString2() == "one")
- {
- money = this.txtReciveMoney.Text.ToDecimal2();
- }
+
int? AccountIdOut = Request["selAccountNameOut"].ToInt32();
@@ -146,12 +145,35 @@
{
var id = this.Keyid.Value.ToInt32().Value;
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
+
+ if (fukuanshenqing.FukuanStatus == 2 && money>0)
+ {
+ JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
+ return;
+ }
+
+ if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
+ return;
+ }
+
var Youwufapiao = Request["rdoReceiveQuannbu"];
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
{
JavaScript.MessageBox("宸茬粡淇濆瓨涓烘湁鍙戠エ锛屾棤娉曚慨鏀逛负鏃犲彂绁紒", this);
return;
}
+
+ if (molingmoney.HasValue)
+ {
+ if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
+ }
+
string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
var ssss = false;
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
@@ -169,17 +191,29 @@
{
fukuanshenqing.FukuanStatus = 2;
}
+ if (molingmoney.HasValue)
+ {
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ }
fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
ssss = _fukuanshenqingBLL.UpdateModel(fukuanshenqing);
- if (this.txtReciveMoney.Text.ToDecimal2() > 0)
+ if (this.txtReciveMoney.Value.ToDecimal2() > 0)
{
List<OA_Procurement> m_OA_ProcurementList = new List<OA_Procurement>();
List<OA_FirmAccountRecord> m_OA_FirmAccountRecordList = new List<OA_FirmAccountRecord>();
m_OA_FirmAccountOut.Balance -= money;
m_OA_FirmAccountOut.AllExpenses += money;
+ decimal molingmoneyvalue = 0;
+ if (molingmoney.HasValue)
+ {
+ molingmoneyvalue = molingmoney.Value;
+ }
foreach (var item in Keys)
{
OA_Procurement m_OA_Procurement = bll_OA_ProcurementBLL.SelectSingleModel(item);
@@ -193,10 +227,24 @@
m_OA_FirmAccountRecordOut.AccountId = m_OA_FirmAccountOut.Keyid;
m_OA_FirmAccountRecordOut.RecordTypeId = 2;//鏀嚭
- if (Request["amount"].ToString2() == "one")
- m_OA_FirmAccountRecordOut.Money = money;
- else
- m_OA_FirmAccountRecordOut.Money = (m_OA_Procurement.AllMoney - m_OA_Procurement.ReceiveMoney);
+ m_OA_FirmAccountRecordOut.Money = m_OA_Procurement.AllMoney.Value;
+ m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney.Value ;
+ if (molingmoneyvalue > 0)
+ {
+ if (m_OA_Procurement.AllMoney.Value >= molingmoneyvalue)
+ {
+ m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney.Value - molingmoneyvalue;
+ m_OA_FirmAccountRecordOut.Money = m_OA_Procurement.AllMoney.Value - molingmoneyvalue;
+ molingmoneyvalue = 0;
+ }
+ else
+ {
+ m_OA_Procurement.ReceiveMoney = 0;
+ m_OA_FirmAccountRecordOut.Money = 0;
+ molingmoneyvalue = molingmoneyvalue - m_OA_Procurement.AllMoney.Value;
+ }
+
+ }
m_OA_FirmAccountRecordOut.SubjectId = m_OA_SubjectSet.Keyid;
m_OA_FirmAccountRecordOut.OperationalMatters = "閲囪喘浠樻";
@@ -208,16 +256,17 @@
m_OA_FirmAccountRecordList.Add(m_OA_FirmAccountRecordOut);
m_OA_ProcurementList.Add(m_OA_Procurement);
+
- if (Request["amount"].ToString2() == "one")
- m_OA_Procurement.ReceiveMoney += money;
- else
- m_OA_Procurement.ReceiveMoney = m_OA_Procurement.AllMoney;
+
if (m_OA_Procurement.ReceiveMoney == m_OA_Procurement.AllMoney)
m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "缁撹处鐘舵��");
+ if (fukuanshenqing.FukuanStatus == 2)
+ m_OA_Procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(1, "缁撹处鐘舵��");
+
m_OA_Procurement.Operator = CurrentUser.ShortName;
m_OA_Procurement.LastUpdateTime = DateTime.Now;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs
index 777c57f..422097c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/CaigouPayEdit.aspx.designer.cs
@@ -78,6 +78,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
/// <summary>
+ /// hidReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReceiveMoney;
+
+ /// <summary>
/// txtYouwufapiao 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -120,7 +129,16 @@
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtReciveMoney;
+
+ /// <summary>
+ /// txtMolingMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtMolingMoney;
/// <summary>
/// btn_Submit 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
index 61cf117..1a93c39 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
@@ -49,6 +49,13 @@
}
}
+
+
+ function molinya() {
+ var sss = $("#hidReceiveMoney").val() - $("#txtMolingMoney").val()
+ $("#txtReciveMoney").val(sss);
+
+ }
</script>
</head>
<body style='margin: 0; padding: 0;'>
@@ -78,6 +85,7 @@
</td>
<td>
<span class="moneystyle" id="spanReceiveMoney" runat="server">锟�</span>
+ <input type="hidden" id="hidReceiveMoney" runat="server" />
</td>
</tr>
<tr>
@@ -85,9 +93,17 @@
鏀跺彇閲戦锛�
</td>
<td >
- <asp:TextBox TextMode="SingleLine" id="txtReciveMoney" runat="server" class="req float" min="0" ReadOnly="true" ></asp:TextBox>
+ <input runat="server" id="txtReciveMoney" runat="server" class="req float" maxlength="18" min="0" readonly="readonly" ></input>
</td>
</tr>
+ <tr>
+ <td class="ali03 ">
+ 鎶归浂閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" onchange="molinya();" />(鍏�)
+ </td>
+ </tr>
<tr>
<td class="ali03 ">
鏈夋棤鍙戠エ锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
index 1a4679f..0173d4c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -133,8 +133,9 @@
return;
}
firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
- var money = this.txtReciveMoney.Text.ToDecimal2();
- if (this.txtReciveMoney.Text.ToDecimal2() > 0 && firmAccount.Balance < this.txtReciveMoney.Text.ToDecimal2())
+ var money = this.txtReciveMoney.Value.ToDecimal2();
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
+ if (this.txtReciveMoney.Value.ToDecimal2() > 0 && firmAccount.Balance < this.txtReciveMoney.Value.ToDecimal2())
{
JavaScript.MessageBox("璐︽埛浣欓涓嶈冻", this);
return;
@@ -144,12 +145,35 @@
var id = this.Keyid.Value.ToInt32().Value;
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
+
+ if (fukuanshenqing.FukuanStatus == 2 && money > 0)
+ {
+ JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
+ return;
+ }
+
+ if (money > (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
+ return;
+ }
+
var Youwufapiao = Request["rdoReceiveQuannbu"];
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
{
JavaScript.MessageBox("宸茬粡淇濆瓨涓烘湁鍙戠エ锛屾棤娉曚慨鏀逛负鏃犲彂绁紒", this);
return;
}
+
+ if (molingmoney.HasValue)
+ {
+ if ((money + molingmoney.Value) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
+ }
+
string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
@@ -167,13 +191,25 @@
{
fukuanshenqing.FukuanStatus = 2;
}
+ if (molingmoney.HasValue)
+ {
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ }
fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
ssss = _fukuanshenqingBLL.UpdateModel(fukuanshenqing);
- if(this.txtReciveMoney.Text.ToDecimal2() > 0)
+ if(this.txtReciveMoney.Value.ToDecimal2() > 0)
{
+ decimal molingmoneyvalue = 0;
+ if (molingmoney.HasValue)
+ {
+ molingmoneyvalue = molingmoney.Value;
+ }
foreach (var item in Keys)
{
if (!string.IsNullOrEmpty(item))
@@ -184,6 +220,23 @@
firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
firmAccountRecord.LastUpdateTime = DateTime.Now;
firmAccountRecord.Money = orderBasic.UnPayedMoney;
+ var UnPayedMoney = orderBasic.UnPayedMoney;
+ if (molingmoneyvalue > 0)
+ {
+ if (UnPayedMoney >= molingmoneyvalue)
+ {
+
+ firmAccountRecord.Money = UnPayedMoney - molingmoneyvalue;
+ molingmoneyvalue = 0;
+ }
+ else
+ {
+ firmAccountRecord.Money = 0;
+ molingmoneyvalue = molingmoneyvalue - UnPayedMoney;
+
+ }
+
+ }
orderNo = orderBasic.SellerOrderId;
firmAccountRecord.OperationalMatters = "澶栧崗浠樻" + "(" + orderNo + ")";
firmAccountRecord.Operator = CurrentUser.ShortName;
@@ -366,7 +419,8 @@
this.spanAllMoney.InnerText = "锟�" + AllMoney.Value.ToString("0.00");
this.spanReceiveMoney.InnerText = "锟�" + ReceiveMoney.Value.ToString("0.00");
- this.txtReciveMoney.Text = ReceiveMoney.Value.ToString("0.00");
+ this.hidReceiveMoney.Value = ReceiveMoney.Value.ToString();
+ this.txtReciveMoney.Value = ReceiveMoney.Value.ToString("0.00");
this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
index 5b6fcf3..5bd3370 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
@@ -78,13 +78,31 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
/// <summary>
+ /// hidReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReceiveMoney;
+
+ /// <summary>
/// txtReciveMoney 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtReciveMoney;
+
+ /// <summary>
+ /// txtMolingMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtMolingMoney;
/// <summary>
/// txtYouwufapiao 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx
index 002cdec..ca9d32f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx
@@ -262,6 +262,13 @@
</table>
<div id="page">
<uc:UCPager ID="UCPager1" runat="server" />
+ <select keepdefaultstyle='true' id='ddlPageSize' runat="server" style="float:right;margin-top:10px;" >
+ <option value="25">25鏉�/椤�</option>
+ <option value="50">50鏉�/椤�</option>
+ <option value="100">100鏉�/椤�</option>
+ <option value="200">200鏉�/椤�</option>
+ </select>
+ <div style="height:100px;"></div>
</div>
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.cs
index 6325d20..af05a9b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.cs
@@ -78,7 +78,8 @@
DateTime? endTime = null;
Pagination pa = new Pagination();
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageSize = this.ddlPageSize.Value.ToInt32().Value;// UCPager1.AspNetPager.PageSize;
+ UCPager1.AspNetPager.PageSize = this.ddlPageSize.Value.ToInt32().Value;
ReProcurentList.DataSource = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId, "", this.selPurchaseStatus.Value, this.selClearingStatus.Value, this.selSuppliers.Value, this.selGoodsName.Value, this.dwCommity.SelectedValue, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : MyConvert.GetDateTime(this.txtRegTimeEnd.Value), this.txtBrandName.Value, this.txtPaperWeight.Value);
ReProcurentList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.designer.cs
index 9eb062c..6b77de6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/PurchasePayments.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.financial {
-
-
- public partial class PurchasePayments {
-
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class PurchasePayments
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selSuppliers 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-
+
/// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-
+
/// <summary>
/// selGoodsName 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selGoodsName;
-
+
/// <summary>
/// selClearingStatus 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selClearingStatus;
-
+
/// <summary>
/// selPurchaseStatus 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPurchaseStatus;
-
+
/// <summary>
/// txtBrandName 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBrandName;
-
+
/// <summary>
/// txtPaperWeight 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaperWeight;
-
+
/// <summary>
/// btn_Register 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Register;
-
+
/// <summary>
/// ReProcurentList 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater ReProcurentList;
-
+
/// <summary>
/// NowAllMoney 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowAllMoney;
-
+
/// <summary>
/// NowPayMoney 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPayMoney;
-
+
/// <summary>
/// NowOweMoney 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowOweMoney;
-
+
/// <summary>
/// AllMoney 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-
+
/// <summary>
/// PayMoney 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl PayMoney;
-
+
/// <summary>
/// OweMoney 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl OweMoney;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
@@ -200,5 +202,14 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+
+ /// <summary>
+ /// ddlPageSize 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ddlPageSize;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
index 1fb4f99..69e63e0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
@@ -79,6 +79,14 @@
</td>
</tr>
<tr>
+ <td class="ali03 ">
+ 鎶归浂閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtMolingMoney" type="text" class=" float" maxlength="18" min="0" />(鍏�)
+ </td>
+ </tr>
+ <tr>
<td class="ali03 ">
鏈夋棤鍙戠エ锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 67f71e4..58a86b2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -122,10 +122,11 @@
{
var id = this.Keyid.Value.ToInt32().Value;
var money = this.txtMoney.Value.ToDecimal2().Value;
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
var Youwufapiao = Request["rdoReceiveQuannbu"];
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
- if (fukuanshenqing.FukuanStatus == 2 && money>0)
+ if (fukuanshenqing.FukuanStatus == 2 && money > 0)
{
JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
return;
@@ -135,6 +136,16 @@
{
JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
return;
+ }
+
+
+ if (molingmoney.HasValue)
+ {
+ if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
}
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -159,6 +170,15 @@
{
fukuanshenqing.FukuanStatus = 2;
}
+
+ if (molingmoney.HasValue)
+ {
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ }
+
fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.designer.cs
index 7cc861a..f1ebce8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.designer.cs
@@ -114,6 +114,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtMoney;
/// <summary>
+ /// txtMolingMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtMolingMoney;
+
+ /// <summary>
/// txtDepartment 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index 437e783..9fed4c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -374,6 +374,13 @@
</asp:Repeater>
<div id="page">
<uc:UCPager ID="UCPager1" runat="server" />
+ <select keepdefaultstyle='true' id='ddlPageSize' runat="server" style="float:right;margin-top:10px;" >
+ <option value="25">25鏉�/椤�</option>
+ <option value="50">50鏉�/椤�</option>
+ <option value="100">100鏉�/椤�</option>
+ <option value="200">200鏉�/椤�</option>
+ </select>
+ <div style="height:100px;"></div>
</div>
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
index 6abb9c2..fa5cef1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.cs
@@ -76,7 +76,8 @@
{
Pagination pa = new Pagination();
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageSize = this.ddlPageSize.Value.ToInt32().Value;// UCPager1.AspNetPager.PageSize;
+ UCPager1.AspNetPager.PageSize = this.ddlPageSize.Value.ToInt32().Value;
ReProcurentList.DataSource = _OA_ProcurementBLL.getModelList(pa, CurrentUser.MemberId, this.selOpretor.Value, this.selPurchaseStatus.Value, this.selClearingStatus.Value, this.selSuppliers.Value, this.selGoodsName.Value, this.dwCommity.SelectedValue, this.txtRegTimeStart.Value.ToDateTime2(), this.txtRegTimeEnd.Value.ToDateTime2(), this.txtBrandName.Value, this.txtPaperWeight.Value);
ReProcurentList.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
index d36ebf6..6b96f9f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx.designer.cs
@@ -148,5 +148,14 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+
+ /// <summary>
+ /// ddlPageSize 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ddlPageSize;
}
}
--
Gitblit v1.9.1