fix(jg)：移装变更区内移装，杨凌韩城变证功能调整

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

@@ -942,12 +942,20 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     useRegistrationCodeList.add(String.valueOf(useRegistrationCode));
                     isUpdateRegistrationCode.set(true);
                 } else {
-                    //如果是区内移装，判断是否为韩城，杨凌，需要变更证号，否则不变证号
+                    // 判断区内移装是否需要变更证号，若为韩城、杨凌或西咸则需变更，否则不变
                     JSONObject newPosition = JSON.parseObject(historyData.getChangeData());
                     String county = newPosition.getString("transferCounty").split("_")[0];
+
+                    JSONObject deviceInfo = JSON.parseObject(device.getDeviceInfo());
+                    String deviceCity = Arrays.stream(((String) deviceInfo.get("USE_PLACE_CODE")).split("#"))
+                            .skip(2)
+                            .findFirst()
+                            .orElseThrow(() -> new BadRequest("没有查询到地市信息"));
+
+                    // 判断是否为韩城、杨凌或西咸的区内移装到其他城市或从其他城市移装到韩城、杨凌或西咸
                     boolean shouldUpdateCode = Arrays.stream(ReginStepEnum.values())
                             .map(ReginStepEnum::getCode)
-                            .anyMatch(code -> code.equals(county));
+                            .anyMatch(code -> code.equals(county) || code.equals(deviceCity));
                     if (shouldUpdateCode) {
                         Map<String, String> supervisoryCodeMap = this.createSupervisoryCode(historyData);
                         supervisoryCode = supervisoryCodeMap.get("superviseCode");