Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -990,7 +990,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 ).list();
 
         // 区外移装更新是否报废字段为1，区内移装不变
-        if ("1".equals(transfer.getTransferType())){
+        if (isUpdateRegistrationCode){
             useRegistrationManageService.lambdaUpdate()
                     .set(JgUseRegistrationManage::getIsScrap, 1)
                     .in(JgUseRegistrationManage::getSequenceNbr,
@@ -1026,7 +1026,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
 
                     registrationManageNew.setCertificateStatus("已登记");
                     registrationManageNew.setApplyNo(transfer.getApplyNo());
-                    if ("1".equals(transfer.getTransferType())){
+                    //新增-区外，或者区内是韩城和杨凌的进行
+                    if (isUpdateRegistrationCode){
                         registrationManageNew.setSequenceNbr(null);
                         registrationManageNew.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, registrationManageNew.getAuditPassDate(), transfer.getReceiveCompanyCode()));
                     }
@@ -1034,6 +1035,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     if(registrationManageNew.getSequenceNbr() != null){
                         registrationManageNew.setVersion(registrationManageNew.getVersion() + 1);
                         registrationManageNew.setChangeReason(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
+                    } else {
+                        registrationManageNew.setChangeReason("");
+                        registrationManageNew.setVersion(1);
                     }
                     // 添加到新列表中
                     newRegistrationList.add(registrationManageNew);