diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 8ab09cd08..93138a0b3 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -124,7 +124,7 @@
-
+
@@ -266,7 +266,7 @@
-
+
@@ -771,7 +771,7 @@
-
+
@@ -1037,7 +1037,7 @@
-
+
@@ -2711,7 +2711,7 @@
-
+
diff --git a/WebContent/fileTemplate/合同（售后回租）和抵押合同.docx b/WebContent/fileTemplate/合同（售后回租）和抵押合同.docx
index cffb19eca..3adf69aba 100644
Binary files a/WebContent/fileTemplate/合同（售后回租）和抵押合同.docx and b/WebContent/fileTemplate/合同（售后回租）和抵押合同.docx differ
diff --git a/src_core/com/tenwa/util/SerialNumberUtil.java b/src_core/com/tenwa/util/SerialNumberUtil.java
index 04ae81e95..9610ff73c 100644
--- a/src_core/com/tenwa/util/SerialNumberUtil.java
+++ b/src_core/com/tenwa/util/SerialNumberUtil.java
@@ -134,7 +134,11 @@ public class SerialNumberUtil {
String currentYear = currentDateTime.substring(0,4);
String currentMonth = currentDateTime.substring(5,7);
String currentDay = currentDateTime.substring(8,10);
- return SerialNumberUtil.getSerialNumber("A"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "Ŀ"+orgId, null, tx);
+ int year = Integer.parseInt(currentYear);
+ int month = Integer.parseInt(currentMonth);
+ int day = Integer.parseInt(currentDay);
+ return SerialNumberUtil.getSerialNumberByDay("A"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "Ŀ", year,month,day, tx);
+ //return SerialNumberUtil.getSerialNumber("A"+currentYear+currentMonth+currentDay+"{maxOrderNumber}",4,null, "Ŀ"+orgId, null, tx);
}
public static synchronized String getProjectSerialNumber2(String orgId,JBOTransaction tx) throws Exception{
diff --git a/src_tenwa/com/tenwa/flow/comm/handler/BusinessCustomerInfoHandler.java b/src_tenwa/com/tenwa/flow/comm/handler/BusinessCustomerInfoHandler.java
index 0d2a6ecfc..80d0aad2b 100644
--- a/src_tenwa/com/tenwa/flow/comm/handler/BusinessCustomerInfoHandler.java
+++ b/src_tenwa/com/tenwa/flow/comm/handler/BusinessCustomerInfoHandler.java
@@ -97,7 +97,7 @@ public class BusinessCustomerInfoHandler extends CommonHandler {
lpit.setAttributeValue("LEGALPERSONNAME", bo.getAttribute("LEGALPERSONNAME"));
lpit.setAttributeValue("AFFILIATEDDATE", bo.getAttribute("AFFILIATEDDATE"));
lpit.setAttributeValue("AFFILIATEDENDDATE", bo.getAttribute("AFFILIATEDENDDATE"));
-// lpit.setAttributeValue("REGISTEREDMONEY", bo.getAttribute("REGISTEREDMONEY"));
+ lpit.setAttributeValue("REGISTEREDMONEY", bo.getAttribute("REGISTEREDMONEY"));
lpit.setAttributeValue("AFFILIATEDACTUALADDRESS", bo.getAttribute("AFFILIATEDACTUALADDRESS"));
lpit.setAttributeValue("AFFILIATEDADDRESS", bo.getAttribute("AFFILIATEDADDRESS"));
lpit.setAttributeValue("TRANSPORTDATE", bo.getAttribute("TRANSPORTDATE"));