1.车用气瓶区外移装监管码不再变化

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

@@ -451,11 +451,12 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             param.put("USE_INNER_CODE", jgChangeVehicleRegistrationUnit.getNewCarNumber());
             if (!ObjectUtils.isEmpty(useRegistCode)) {
                 param.put("USE_ORG_CODE", useRegistCode);
-                LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
-                IdxBizJgOtherInfo idxBizJgOtherInfo = otherInfoMapper.selectOne(eq);
-                if (!ObjectUtils.isEmpty(idxBizJgOtherInfo)) {
-                    param.put("SUPERVISORY_CODE", idxBizJgOtherInfo.getSupervisoryCode());
-                }
+                // 需求调整 监管码一生不再变化
+                // LambdaQueryWrapper<IdxBizJgOtherInfo> eq = new QueryWrapper<IdxBizJgOtherInfo>().lambda().eq(IdxBizJgOtherInfo::getRecord, item);
+                // IdxBizJgOtherInfo idxBizJgOtherInfo = otherInfoMapper.selectOne(eq);
+                // if (!ObjectUtils.isEmpty(idxBizJgOtherInfo)) {
+                //     param.put("SUPERVISORY_CODE", idxBizJgOtherInfo.getSupervisoryCode());
+                // }
             }
             objMap.put(item, param);
         });
@@ -511,6 +512,7 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 CompanyModel receiveParentResult = Privilege.companyClient.seleteOne(receiveCompanyResult.getParentId()).getResult();
                 receiveCompanyCode = receiveParentResult.getCompanyCode();
             }
+            // 生成新的监管码
             String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
             manage.setUseRegistrationCode(code);
             // 更新设备使用登记证信息
@@ -519,10 +521,10 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
             IdxBizJgRegisterInfo registerInfo = new IdxBizJgRegisterInfo();
             registerInfo.setUseOrgCode(code);
             idxBizJgRegisterInfoService.update(registerInfo, lambda);
-            // 使用登记证下设备更新监管码
-            collect.forEach(a -> {
-                createCode(jgChangeVehicleRegistrationUnit, manage.getEquDefineCode(), a);
-            });
+            // 使用登记证下设备更新监管码， 需求调整 监管码一生不再变化
+            // collect.forEach(a -> {
+            //     createCode(jgChangeVehicleRegistrationUnit, manage.getEquDefineCode(), a);
+            // });
             // 更新es数据
             updateEsData(collect, jgChangeVehicleRegistrationUnit, code);
         }