diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/ChargebackVoucherTotal.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/ChargebackVoucherTotal.jsp
index fbdbdc034..5518bba08 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/ChargebackVoucherTotal.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/ChargebackVoucherTotal.jsp
@@ -1,28 +1,23 @@
<%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
- /*
- Author: undefined 2018-12-18
- Content:
- History Log:
- */
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+<%
ASObjectModel doTemp = new ASObjectModel("ChargebackVoucherTotal");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.MultiSelect = true; //多选
- dwTemp.ReadOnly = "0"; //只读模式
-// dwTemp.ShowSummary = "1"; //显示小计
+ dwTemp.ReadOnly = "0"; //只读模式
+ // dwTemp.ShowSummary = "1"; //显示小计
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
-
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
{"true","All","Button","保存","保存批次号","save()","","","","",""},
-
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java b/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
index dfc3c371f..e0c2eecff 100644
--- a/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
+++ b/calc/com/tenwa/reckon/check/ChargebackVoucherTotal.java
@@ -16,7 +16,10 @@ public class ChargebackVoucherTotal{
private String COLLECT_STATUS;
private String CHANNEL;
private String HIRE_DATE;
- //校验是否已存在
+
+ /**
+ * 校验批次号次否已保存
+ */
public String checkSBN(JBOTransaction tx) throws JBOException{
BizObject vs= JBOFactory.createBizObjectQuery(jbo.com.tenwa.lease.comm.VERIFICATIONSPARE.CLASS_NAME, "SPARE_BATCH_NO=:SPARE_BATCH_NO").setParameter("SPARE_BATCH_NO", SPARE_BATCH_NO_DATA).getSingleResult(false);
if(vs==null||"".equals(vs)){
@@ -24,16 +27,25 @@ public class ChargebackVoucherTotal{
}
return "Y";
}
+
+ /**
+ * 对批次号做重复校验, 没问题则保存
+ */
public String saveBatchNo(JBOTransaction tx){
List rentList;
try {
+ // 根据实收日期, 银行账号, 查询租金实收数据
rentList = JBOFactory.createBizObjectQuery(jbo.app.tenwa.calc.LC_RENT_INCOME.CLASS_NAME, "HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER").setParameter("HIRE_DATE", HIRE_DATE).setParameter("OWN_NUMBER", OWN_NUMBER).getResultList(false);
+
+ // 根据批次号查询租金计划表数据, 校验批次号是否重复
BizObjectManager rent_p = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx);
BizObject checkSBN = rent_p.createQuery("SPARE_BATCH_NO=:SPARE_BATCH_NO").setParameter("SPARE_BATCH_NO",SPARE_BATCH_NO).getSingleResult(false);
if(checkSBN!=null){
return "批次号"+SPARE_BATCH_NO+"已存在;";
}
+
// List rentIDs = JBOFactory.createBizObjectQuery(jbo.com.tenwa.lease.comm.VI_CHARGEBACKVOUCHERTOTAL.CLASS_NAME, "HIRE_DATE=:HIRE_DATE and OWN_NUMBER=:OWN_NUMBER and CHANNEL=:CHANNEL").setParameter("HIRE_DATE", HIRE_DATE).setParameter("OWN_NUMBER", OWN_NUMBER).setParameter("CHANNEL", CHANNEL).getResultList(false);
+ // 查询当前批次卡扣数据, 存储批次号入租金计划表
if(rentList.size()>0){
for(BizObject rentID:rentList){
String id = rentID.getAttribute("PLAN_ID").toString();
@@ -45,7 +57,8 @@ public class ChargebackVoucherTotal{
rent_p.saveObject(rent_p_jbo);
}
}
- //如果是更改的核销信息,则在相应的VERIFICATIONSPARE表里也要更改。
+
+ //如果是更改的核销信息,则在相应的VERIFICATIONSPARE表里也要更改。(核销后不允许更改, 此功能暂时用不到)
if("Y".equals(this.checkSBN(tx))){
BizObjectManager vs = JBOFactory.getBizObjectManager(jbo.com.tenwa.lease.comm.VERIFICATIONSPARE.CLASS_NAME,tx);
BizObject change = vs.createQuery("SPARE_BATCH_NO=:SPARE_BATCH_NO").setParameter("SPARE_BATCH_NO",SPARE_BATCH_NO_DATA).getSingleResult(true);
@@ -53,7 +66,6 @@ public class ChargebackVoucherTotal{
vs.saveObject(change);
}
} catch (JBOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
return "ERROR";
}
@@ -105,6 +117,4 @@ public class ChargebackVoucherTotal{
public void setHIRE_DATE(String hIRE_DATE) {
HIRE_DATE = hIRE_DATE;
}
-
-
}