1.单据编号优化

applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationFormDTO.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.money.dto;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,7 +11,7 @@ import java.util.List;
  * @createtime 2018-10-22-17:02
  */
 @Data
-public class VerificationFormDTO implements Serializable {
+public class VerificationFormDTO extends BaseFormDTO implements Serializable {
     private VerificationDTO main;
 
     public VerificationDTO getMain() {

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtran.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author heqw
  * @date 2018/10/25 19:28
  **/
-public class Fundtran {
+public class Fundtran extends BaseFormDTO implements Serializable {
     private Fundtransfer main;
     private List<Fundtransferdetail> items;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Othsp.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author heqw
  * @date 2018/10/24 17:42
  **/
-public class Othsp {
+public class Othsp extends BaseFormDTO implements Serializable {
     private Othspendings main;
     private List<Othspendingsdetail> items;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Othte.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author heqw
  * @date 2018/10/24 17:37
  **/
-public class Othte {
+public class Othte extends BaseFormDTO implements Serializable {
     private Othreceipts main;
     private List<Othreceiptsdetail> items;
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Pay.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author heqw
  * @date 2018/10/23 10:19
  **/
-public class Pay {
+public class Pay extends BaseFormDTO implements Serializable {
     private Paybalance main;
     private List<Paybalancedet> items1;
     private List<Paybalancedetail> items2;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Rec.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.money.po;
 
+import com.usoftchina.saas.commons.dto.BaseFormDTO;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author heqw
  * @date 2018/10/23 15:59
  **/
-public class Rec {
+public class Rec extends BaseFormDTO implements Serializable {
     private Recbalance main;
     private List<Recbalancedet> items1;
     private List<Recbalancedetail> items2;

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -57,7 +57,9 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         String ft_code = fundtransfer.getFt_code();
 
         //编号校验
-        ft_code = pushMaxnubmer(ft_code, fundtransfer.getId());
+        if(fundtran.isCodeModified()) {
+            ft_code = pushMaxnubmer(ft_code, fundtransfer.getId());
+        }
 
         //单号赋值
         fundtransfer.setFt_code(ft_code);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -65,7 +65,9 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         String or_code = othreceipts.getOr_code();
 
         //编号校验
-        or_code = pushMaxnubmer(or_code, othreceipts.getId());
+        if(othte.isCodeModified()) {
+            or_code = pushMaxnubmer(or_code, othreceipts.getId());
+        }
 
         //单号赋值
         othreceipts.setOr_code(or_code);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -60,7 +60,9 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         String os_code = othspendings.getOs_code();
 
         //编号校验
-        os_code = pushMaxnubmer(os_code, othspendings.getId());
+        if(othsp.isCodeModified()) {
+            os_code = pushMaxnubmer(os_code, othspendings.getId());
+        }
         //单号赋值
         othspendings.setOs_code(os_code);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -61,7 +61,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
 
         String pb_code = paybalance.getPb_code();
         //编号校验
-        pb_code = pushMaxnubmer(pb_code, paybalance.getId());
+        if(pay.isCodeModified()) {
+            pb_code = pushMaxnubmer(pb_code, paybalance.getId());
+        }
         //单号赋值
         paybalance.setPb_code(pb_code);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -64,7 +64,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         String pu_code = recbalance.getRb_code();
 
         //编号校验
-        pu_code = pushMaxnubmer(pu_code, recbalance.getId());
+        if(rec.isCodeModified()) {
+            pu_code = pushMaxnubmer(pu_code, recbalance.getId());
+        }
         //单号赋值
         recbalance.setRb_code(pu_code);
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -130,7 +130,9 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         Long id = main.getId();
         String code = main.getVc_code();
         //编号校验
-        code = pushMaxnubmer(code, id);
+        if(formdata.isCodeModified()) {
+            code = pushMaxnubmer(code, id);
+        }
         main.setVc_code(code);
 
         Verification verification = BeanMapper.map(main,Verification.class);