1.历史登记时增加96333码的选择性录入

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/IdxBizJgRegisterInfoServiceImpl.java

@@ -2430,12 +2430,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         otherInfo.setRecDate(date);
         otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
         if (isCopy) {
-            // 96333码和监管码置空
-            otherInfo.setCode96333(null);
-            otherInfo.setSupervisoryCode(null);
-            otherInfo.setCylinderStampAttachment(null);
-            otherInfo.setInformationSituation(null);
-            otherInfo.setInformationManageCode(null);
+            // 复制且有无96333识别码选择 无 96333码置空
+            if("2".equals(otherInfo.getCode96333Type())){
+                otherInfo.setCode96333("");
+            }
+            // 监管码置空
+            otherInfo.setSupervisoryCode("");
+            otherInfo.setCylinderStampAttachment("");
+            otherInfo.setInformationSituation("");
+            otherInfo.setInformationManageCode("");
+        }
+        // 编辑时，如果选择<无96333识别码>，则把已经入库的数据清除掉
+        if(OPERATEEDIT.equals(operateType) && "2".equals(otherInfo.getCode96333Type())){
+            otherInfo.setCode96333("");
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 

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/JgUseRegistrationServiceImpl.java

@@ -2362,7 +2362,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Map<String, Object> result = code.getResult();
             if (!ObjectUtils.isEmpty(result)) {
                 otherInfo.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
-                otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? null : String.valueOf(result.get("code96333")));
+                // 历史登记时 96333如果自行输入则不再进行生成插入
+                if(StringUtils.isEmpty(otherInfo.getCode96333())){
+                    otherInfo.setCode96333(ObjectUtils.isEmpty(result.get("code96333")) ? "" : String.valueOf(result.get("code96333")));
+                }
                 // 更新使用登记业务表
                 jgUseRegistration.setSupervisoryCode(String.valueOf(result.get("superviseCode")));
             }