diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
index d7402a174..e71ef92ee 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
@@ -72,6 +72,13 @@ public class DictDataController {
         return success(BeanUtils.toBean(list, DictDataSimpleRespVO.class));
     }
 
+    @GetMapping("/getByDictType")
+    @Operation(summary = "根据字典类型获取字典信息列表", description = "一般用于管理后台缓存字典数据在本地")
+    public CommonResult<List<DictDataDO>> getByDictType(@RequestParam String dictType) {
+        List<DictDataDO> list = dictDataService.getDictDataListByDictType(dictType);
+        return success(list);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "/获得字典类型的分页列表")
     @PreAuthorize("@ss.hasPermission('system:dict:query')")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaSaveReqVO.java
index 2b3c1c952..a6a3f7a8f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/housearea/vo/HouseAreaSaveReqVO.java
@@ -15,6 +15,9 @@ public class HouseAreaSaveReqVO {
     @Schema(description = "地图id", example = "芋艿")
     private Long positionMapId;
 
+    @Schema(description = "地图id", example = "芋艿")
+    private String skuInfo;
+
     @Schema(description = "库区名称", example = "李四")
     private String areaName;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/WareHouseLocationController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/WareHouseLocationController.java
index 68a15dd52..95e303575 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/WareHouseLocationController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/WareHouseLocationController.java
@@ -1,35 +1,33 @@
 package cn.iocoder.yudao.module.system.controller.admin.houselocation;
 
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHouseLocationPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHouseLocationRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHouseLocationSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHouseLocationVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.houselocation.WareHouseLocationDO;
 import cn.iocoder.yudao.module.system.service.houselocation.HouseLocationService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-
 
 @Tag(name = "管理后台 - 库位")
 @RestController
@@ -73,6 +71,15 @@ public class WareHouseLocationController {
         return success(BeanUtils.toBean(houseLocation, WareHouseLocationRespVO.class));
     }
 
+    @GetMapping("/getByMapItemId")
+    @Operation(summary = "根据点位获取库位信息列表")
+    @Parameter(name = "mapId", description = "地图id", required = true, example = "1024")
+    @Parameter(name = "mapItemId", description = "地图点位id", required = true, example = "1024")
+    public CommonResult<List<WareHouseLocationRespVO>> getByMapItemId(@RequestParam("mapId") Long mapId, @RequestParam("mapItemId") Long mapItemId) {
+        List<WareHouseLocationDO> list = houseLocationService.getByMapItemId(mapId, mapItemId);
+        return success(BeanUtils.toBean(list, WareHouseLocationRespVO.class));
+    }
+
     @PostMapping("/page")
     @Operation(summary = "获得库位分页")
     @PreAuthorize("@ss.hasPermission('ware:house-location:query')")
@@ -86,12 +93,12 @@ public class WareHouseLocationController {
     @PreAuthorize("@ss.hasPermission('ware:house-location:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportHouseLocationExcel(@Valid WareHouseLocationPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
+                                         HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<WareHouseLocationDO> list = houseLocationService.getHouseLocationPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "库位.xls", "数据", WareHouseLocationRespVO.class,
-                        BeanUtils.toBean(list, WareHouseLocationRespVO.class));
+                BeanUtils.toBean(list, WareHouseLocationRespVO.class));
     }
 
     @PostMapping("/getLocationByName")
@@ -101,4 +108,4 @@ public class WareHouseLocationController {
         return success(houseLocationService.getLocationByName(requestVO));
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java
index 11ff2a76a..07f0a052b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java
@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.controller.admin.information;
 
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.DeviceInformationDTO;
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.MapBindDeviceInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationSaveReqVO;
@@ -74,11 +76,18 @@ public class DeviceInformationController {
 
     @GetMapping("/list")
     @Operation(summary = "获得设备信息列表")
-    public CommonResult<List<DeviceInformationRespVO>> getList(@Valid DeviceInformationPageReqVO pageReqVO) {
-        List<DeviceInformationDO> list = informationService.getList(pageReqVO);
+    public CommonResult<List<DeviceInformationRespVO>> getList(@Valid DeviceInformationDTO dto) {
+        List<DeviceInformationDO> list = informationService.getList(dto);
         return success(BeanUtils.toBean(list, DeviceInformationRespVO.class));
     }
 
+    @PostMapping("/mapBindDeviceInfo")
+    @Operation(summary = "地图绑定设备")
+    public CommonResult<Boolean> mapBindDeviceInfo(@Valid MapBindDeviceInfoDTO dto) {
+        informationService.mapBindDeviceInfo(dto);
+        return success(true);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得设备信息分页")
     @PreAuthorize("@ss.hasPermission('device:information:query')")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/DeviceInformationDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/DeviceInformationDTO.java
new file mode 100644
index 000000000..f9fcdb9ea
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/DeviceInformationDTO.java
@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.controller.admin.information.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 设备信息 DTO")
+@Data
+@ToString(callSuper = true)
+public class DeviceInformationDTO {
+    @Schema(description = "获取未绑定地图的设备 0否 1是 默认否", example = "6609")
+    private Integer unboundFlag;
+
+    @Schema(description = "地图id", example = "6609")
+    private Long positionMapId;
+
+    @Schema(description = "设备类型 字典device_type", example = "2")
+    private Integer deviceType;
+
+    @Schema(description = "设备状态（1：在线、2：离线、 3：异常）", example = "1")
+    private Integer deviceStatus;
+
+    @Schema(description = "设备启用禁用（0：禁用、1：启用）")
+    private Integer deviceEnable;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/MapBindDeviceInfoDTO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/MapBindDeviceInfoDTO.java
new file mode 100644
index 000000000..2730d398f
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/dto/MapBindDeviceInfoDTO.java
@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.system.controller.admin.information.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+@Schema(description = "管理后台 - 地图绑定设备DTO")
+@Data
+public class MapBindDeviceInfoDTO {
+    @Schema(description = "地图id", example = "6609")
+    private Long positionMapId;
+    @Schema(description = "设备id", example = "6609")
+    private Long deviceInfoId;
+    @Schema(description = "类型 1绑定 2取消绑定")
+    private Integer type;
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationPageReqVO.java
index 76a2cdd15..be3d14bf8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationPageReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationPageReqVO.java
@@ -35,7 +35,7 @@ public class DeviceInformationPageReqVO extends PageParam {
     @Schema(description = "深度")
     private BigDecimal locationDeep;
 
-    @Schema(description = "设备类型（1：充电桩、2：输送线、 3：码垛机、4：拆垛机、5：自动门、6：提升机、7：信号灯、8：按钮盒）", example = "2")
+    @Schema(description = "设备类型 字典device_type", example = "2")
     private Integer deviceType;
 
     @Schema(description = "设备编号")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationRespVO.java
index 769730bbb..c4643c5f8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationRespVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationRespVO.java
@@ -42,8 +42,8 @@ public class DeviceInformationRespVO {
     @ExcelProperty("深度")
     private BigDecimal locationDeep;
 
-    @Schema(description = "设备类型（1：充电桩、2：输送线、 3：码垛机、4：拆垛机、5：自动门、6：提升机、7：信号灯、8：按钮盒）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
-    @ExcelProperty("设备类型（1：充电桩、2：输送线、 3：码垛机、4：拆垛机、5：自动门、6：提升机、7：信号灯、8：按钮盒）")
+    @Schema(description = "设备类型 字典device_type", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("设备类型 字典device_type")
     private Integer deviceType;
 
     @Schema(description = "设备编号")
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationSaveReqVO.java
index abefb1326..c62865911 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/vo/DeviceInformationSaveReqVO.java
@@ -34,7 +34,7 @@ public class DeviceInformationSaveReqVO {
     @Schema(description = "深度")
     private BigDecimal locationDeep;
 
-    @Schema(description = "设备类型（1：充电桩、2：输送线、 3：码垛机、4：拆垛机、5：自动门、6：提升机、7：信号灯、8：按钮盒）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "设备类型 字典device_type", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "设备类型不能为空")
     private Integer deviceType;
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapLineController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapLineController.java
index 1ecc1c62f..e9133d8ac 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapLineController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/PositionMapLineController.java
@@ -29,11 +29,12 @@ public class PositionMapLineController {
     @Resource
     private PositionMapLineService positionMapLineService;
 
-    @PostMapping("/createOrEdit")
-    @Operation(summary = "创建编辑仓库点位地图连线")
+    @PostMapping("/createOrEditOrDel")
+    @Operation(summary = "创建编辑删除仓库点位地图连线")
     @PreAuthorize("@ss.hasPermission('system:position-map-line:create')")
-    public CommonResult<Long> createPositionMapLine(@Valid @RequestBody PositionMapLineSaveReqVO createReqVO) {
-        return success(positionMapLineService.createOrEditPositionMapLine(createReqVO));
+    public CommonResult<Boolean> createOrEditOrDel(@RequestParam Long positionMapId, @Valid @RequestBody List<PositionMapLineSaveReqVO> createReqVO) {
+        positionMapLineService.createOrEditPositionMapLine(positionMapId, createReqVO);
+        return success(true);
     }
 
     @DeleteMapping("/delete")
@@ -58,8 +59,7 @@ public class PositionMapLineController {
     @Operation(summary = "通过地图id获取连线列表")
     @PreAuthorize("@ss.hasPermission('system:position-map-line:query')")
     public CommonResult<List<PositionMapLineRespVO>> list(@RequestParam Long positionMapId) {
-        List<PositionMapLineDO> list = positionMapLineService.list(new LambdaQueryWrapperX<PositionMapLineDO>()
-                .eq(PositionMapLineDO::getPositionMapId, positionMapId));
+        List<PositionMapLineDO> list = positionMapLineService.getByMapId(positionMapId);
         return success(BeanUtils.toBean(list, PositionMapLineRespVO.class));
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/housearea/HouseAreaDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/housearea/HouseAreaDO.java
index de288d6f6..50cf8d101 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/housearea/HouseAreaDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/housearea/HouseAreaDO.java
@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.housearea;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 库区 DO
@@ -30,7 +32,10 @@ public class HouseAreaDO extends BaseDO {
      * 地图id
      */
     private Long positionMapId;
-
+    /**
+     * 物料信息
+     */
+    private String skuInfo;
     /**
      * 库区名称
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/houselocation/WareHouseLocationDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/houselocation/WareHouseLocationDO.java
index 7cc11e61a..b138a1e78 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/houselocation/WareHouseLocationDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/houselocation/WareHouseLocationDO.java
@@ -1,10 +1,10 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.houselocation;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.*;
+
+import java.math.BigDecimal;
 
 /**
  * 库位 DO
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/information/DeviceInformationDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/information/DeviceInformationDO.java
index 4409037f1..fd8460e96 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/information/DeviceInformationDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/information/DeviceInformationDO.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -34,10 +35,12 @@ public class DeviceInformationDO extends BaseDO {
     /**
      * 地图id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long positionMapId;
     /**
      * 地图子表节点id
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long positionMapItemId;
     /**
      * 库位坐标x轴
@@ -56,7 +59,7 @@ public class DeviceInformationDO extends BaseDO {
      */
     private BigDecimal locationDeep;
     /**
-     * 设备类型（1：充电桩、2：输送线、 3：码垛机、4：拆垛机、5：自动门、6：提升机、7：信号灯、8：按钮盒）
+     * 设备类型 字典device_type
      */
     private Integer deviceType;
     /**
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/DeviceStrategyImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/DeviceStrategyImpl.java
index 0157b54b4..0be191c6e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/DeviceStrategyImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/DeviceStrategyImpl.java
@@ -23,7 +23,6 @@ public class DeviceStrategyImpl implements NodeProcessingStrategy {
     public void processNodes(Long positionMapId, List<NodeBaseDTO> nodeBaseDTOS) {
         // -- 策略3 处理设备点
         // -- 将data里面的json 数据转为实体类 - 再对比节点id - 然后做新增删除修改操作
-        // ---------------      dataJSON里面没有具体的类的id - 然后库位要根据层数添加 多个库位数据 即 一个点位 对应多个库位
         List<DeviceInformationDO> newList = new ArrayList<>();
         nodeBaseDTOS.forEach(item -> {
             if (item.getId() == null) {
@@ -31,9 +30,6 @@ public class DeviceStrategyImpl implements NodeProcessingStrategy {
             }
             item.setPositionMapId(positionMapId);
             DeviceInformationDO deviceInformationDO = JSONUtil.toBean(item.getDataJson(), DeviceInformationDO.class);
-            if (deviceInformationDO.getId() == null) {
-                deviceInformationDO.setId(getId());
-            }
             deviceInformationDO.setLocationX(item.getLocationX());
             deviceInformationDO.setLocationY(item.getLocationY());
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/HouseLocationStrategyImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/HouseLocationStrategyImpl.java
index fa9b82d26..769480f76 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/HouseLocationStrategyImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/handler/mapnode/strategy/HouseLocationStrategyImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.handler.mapnode.strategy;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.controller.admin.positionmap.dto.NodeBaseDTO;
@@ -31,16 +32,23 @@ public class HouseLocationStrategyImpl implements NodeProcessingStrategy {
             item.setPositionMapId(positionMapId);
             // -- 如果是库位点 - 可能是一对多情况 - 需要将多个库位点的id set进去
             List<WareHouseLocationDO> wareHouseLocationDOS = JSONUtil.toList(item.getDataJson(), WareHouseLocationDO.class);
-            wareHouseLocationDOS.forEach(wareHouseLocationDO -> {
+            // -- 筛选出 库位编号不为空 - 并且第最后一组数据 最大的值 - 如果没有则为0
+            int max = wareHouseLocationDOS.stream().map(WareHouseLocationDO::getLocationNo).filter(StrUtil::isNotEmpty)
+                    .mapToInt(s -> Integer.parseInt(s.split("_")[2])).max().orElse(0);
+            for (WareHouseLocationDO wareHouseLocationDO : wareHouseLocationDOS) {
                 wareHouseLocationDO.setLocationX(item.getLocationX());
                 wareHouseLocationDO.setLocationY(item.getLocationY());
                 if (wareHouseLocationDO.getId() == null) {
                     wareHouseLocationDO.setId(getId());
                 }
+                if (StrUtil.isEmpty(wareHouseLocationDO.getLocationNo())) {
+                    // -- 生成库位编号 -
+                    wareHouseLocationDO.setLocationNo(positionMapId + "_" + item.getId() + "_" + max++);
+                }
                 wareHouseLocationDO.setMapId(positionMapId);
                 wareHouseLocationDO.setMapItemId(item.getId());
                 newList.add(wareHouseLocationDO);
-            });
+            }
             item.setDataJson(JSONUtil.toJsonStr(wareHouseLocationDOS));
         });
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationService.java
index 856e185fa..e192bfb29 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationService.java
@@ -71,10 +71,19 @@ public interface HouseLocationService extends IService<WareHouseLocationDO> {
      * @return
      */
     List<WareHouseLocationDO> getByMapId(Long positionMapId);
+
     /**
-     *
      * @param requestVO
      * @return
      */
     List<WareHouseLocationRespVO> getLocationByName(WareHouseLocationVO requestVO);
+
+    /**
+     * 根据地图id 点位id 获取库位信息
+     *
+     * @param mapId
+     * @param mapItemId
+     * @return
+     */
+    List<WareHouseLocationDO> getByMapItemId(Long mapId, Long mapItemId);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationServiceImpl.java
index 9c24b7fc1..6caca5d7f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselocation/HouseLocationServiceImpl.java
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHous
 import cn.iocoder.yudao.module.system.controller.admin.houselocation.vo.WareHouseLocationVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.houselocation.WareHouseLocationDO;
 import cn.iocoder.yudao.module.system.dal.mysql.houselocation.WareHouseLocationMapper;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -81,6 +81,13 @@ public class HouseLocationServiceImpl extends ServiceImpl<WareHouseLocationMappe
         return houseLocationMapper.getLocationByName(requestVO);
     }
 
+    @Override
+    public List<WareHouseLocationDO> getByMapItemId(Long mapId, Long mapItemId) {
+        return houseLocationMapper.selectList(new LambdaQueryWrapper<WareHouseLocationDO>()
+                .eq(WareHouseLocationDO::getMapId, mapId)
+                .eq(WareHouseLocationDO::getMapItemId, mapItemId));
+    }
+
     @Override
     public void batchSaveOrEditOrDel(Long positionMapId, List<List<WareHouseLocationDO>> list) {
         //批量添加、修改、删除
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java
index 42fcd2ae3..0cd53ebe3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java
@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.system.service.information;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.DeviceInformationDTO;
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.MapBindDeviceInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.information.DeviceInformationDO;
@@ -73,10 +75,17 @@ public interface DeviceInformationService {
     /**
      * 获取设备列表
      *
-     * @param pageReqVO
+     * @param dto
      * @return
      */
-    List<DeviceInformationDO> getList(@Valid DeviceInformationPageReqVO pageReqVO);
+    List<DeviceInformationDO> getList(@Valid DeviceInformationDTO dto);
+
+    /**
+     * 地图绑定设备
+     *
+     * @param dto
+     */
+    void mapBindDeviceInfo(@Valid MapBindDeviceInfoDTO dto);
 
     /**
      * 获得设备信息分类列表
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java
index 90ed034dc..8ebaed4e5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java
@@ -6,6 +6,8 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.grpc.api.GrpcServiceApi;
 import cn.iocoder.yudao.module.system.constant.device.DeviceChcheConstant;
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.DeviceInformationDTO;
+import cn.iocoder.yudao.module.system.controller.admin.information.dto.MapBindDeviceInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.information.vo.DeviceInformationSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.information.DeviceInformationDO;
@@ -137,9 +139,14 @@ public class DeviceInformationServiceImpl implements DeviceInformationService {
     }
 
     @Override
-    public List<DeviceInformationDO> getList(DeviceInformationPageReqVO pageReqVO) {
+    public List<DeviceInformationDO> getList(DeviceInformationDTO dto) {
         return informationMapper.selectList(new LambdaQueryWrapper<DeviceInformationDO>()
-                .eq(pageReqVO.getDeviceType() != null, DeviceInformationDO::getDeviceType, pageReqVO.getDeviceType()));
+                .isNull(dto.getUnboundFlag() != null && dto.getUnboundFlag() == 1, DeviceInformationDO::getPositionMapId)
+                .eq(dto.getPositionMapId() != null, DeviceInformationDO::getPositionMapId, dto.getPositionMapId())
+                .eq(dto.getDeviceType() != null, DeviceInformationDO::getDeviceType, dto.getDeviceType())
+                .eq(dto.getDeviceStatus() != null, DeviceInformationDO::getDeviceStatus, dto.getDeviceStatus())
+                .eq(dto.getDeviceEnable() != null, DeviceInformationDO::getDeviceEnable, dto.getDeviceEnable())
+        );
     }
 
     /**
@@ -184,4 +191,15 @@ public class DeviceInformationServiceImpl implements DeviceInformationService {
 
         return collect;
     }
+    @Override
+    public void mapBindDeviceInfo(MapBindDeviceInfoDTO dto) {
+        DeviceInformationDO deviceInformationDO = informationMapper.selectById(dto.getDeviceInfoId());
+        if (dto.getType() == 1) {
+            deviceInformationDO.setPositionMapId(dto.getPositionMapId());
+        } else {
+            deviceInformationDO.setPositionMapId(null);
+            deviceInformationDO.setPositionMapItemId(null);
+        }
+        informationMapper.updateById(deviceInformationDO);
+    }
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineService.java
index 5deaf7db2..0c311c22c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineService.java
@@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapLine
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 仓库点位地图连线 Service 接口
@@ -41,8 +42,24 @@ public interface PositionMapLineService extends IService<PositionMapLineDO> {
     /**
      * 创建编辑仓库点位地图连线
      *
+     * @param positionMapId
      * @param createReqVO
      * @return
      */
-    Long createOrEditPositionMapLine(@Valid PositionMapLineSaveReqVO createReqVO);
+    void createOrEditPositionMapLine(Long positionMapId, @Valid List<PositionMapLineSaveReqVO> createReqVO);
+
+    /**
+     * 根据地图id获取连线列表
+     *
+     * @param positionMapId
+     * @return
+     */
+    List<PositionMapLineDO> getByMapId(Long positionMapId);
+
+    /**
+     * 疲劳新增删除编辑
+     *
+     * @param list
+     */
+    void batchSaveOrEditOrDel(List<List<PositionMapLineDO>> list);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineServiceImpl.java
index 79f370c1d..6040d1cc1 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapLineServiceImpl.java
@@ -1,16 +1,24 @@
 package cn.iocoder.yudao.module.system.service.positionmap;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLinePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.positionmap.vo.PositionMapLineSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.houselocation.WareHouseLocationDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.positionmap.PositionMapLineDO;
 import cn.iocoder.yudao.module.system.dal.mysql.positionmap.PositionMapLineMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.hutool.core.collection.CollUtil.isNotEmpty;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 /**
  * 仓库点位地图连线 Service 实现类
@@ -41,14 +49,32 @@ public class PositionMapLineServiceImpl extends ServiceImpl<PositionMapLineMappe
     }
 
     @Override
-    public Long createOrEditPositionMapLine(PositionMapLineSaveReqVO createReqVO) {
-        PositionMapLineDO positionMapLine = BeanUtils.toBean(createReqVO, PositionMapLineDO.class);
-        if (positionMapLine.getId() == null) {
-            positionMapLineMapper.insert(positionMapLine);
-        } else {
-            positionMapLineMapper.updateById(positionMapLine);
+    public void createOrEditPositionMapLine(Long positionMapId, List<PositionMapLineSaveReqVO> createReqVO) {
+        List<PositionMapLineDO> newList = BeanUtils.toBean(createReqVO, PositionMapLineDO.class);
+        List<PositionMapLineDO> oldList = this.getByMapId(positionMapId);
+        List<List<PositionMapLineDO>> list = CollectionUtils.diffList(oldList, newList,
+                (oldVal, newVal) -> ObjectUtil.equal(oldVal.getId(), newVal.getId()));
+        this.batchSaveOrEditOrDel(list);
+    }
+
+    @Override
+    public List<PositionMapLineDO> getByMapId(Long positionMapId) {
+        return positionMapLineMapper.selectList(new LambdaQueryWrapper<PositionMapLineDO>()
+                .eq(PositionMapLineDO::getPositionMapId, positionMapId));
+    }
+
+    @Override
+    public void batchSaveOrEditOrDel(List<List<PositionMapLineDO>> list) {
+        //批量添加、修改、删除
+        if (isNotEmpty(list.get(0))) {
+            positionMapLineMapper.insertBatch(list.get(0));
+        }
+        if (isNotEmpty(list.get(1))) {
+            positionMapLineMapper.updateBatch(list.get(1));
+        }
+        if (isNotEmpty(list.get(2))) {
+            positionMapLineMapper.deleteByIds(convertList(list.get(2), PositionMapLineDO::getId));
         }
-        return positionMapLine.getId();
     }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/job/DistributeTasksServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/job/DistributeTasksServiceImpl.java
index e2fdced51..2789841af 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/job/DistributeTasksServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/robot/job/DistributeTasksServiceImpl.java
@@ -21,6 +21,8 @@ import cn.iocoder.yudao.module.system.enums.robot.*;
 import cn.iocoder.yudao.module.system.util.redis.RedisUtil;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,12 +31,12 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
-
 @Service
 @Slf4j
 public class DistributeTasksServiceImpl implements DistributeTasksService {
@@ -111,8 +113,8 @@ public class DistributeTasksServiceImpl implements DistributeTasksService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Pair<List<RobotInformationDO>, List<RobotTaskDetailDO>> getRobotAndTaskDetails() {
-        Pair<List<RobotInformationDO>, List<RobotTaskDetailDO>> pair = Pair.of(new ArrayList<>(), new ArrayList<>());;
-
+        Pair<List<RobotInformationDO>, List<RobotTaskDetailDO>> pair = Pair.of(new ArrayList<>(), new ArrayList<>());
+        TenantContextHolder.setTenantId(1L);
         List<RobotInformationDO> robots = robotInformationMapper.selectList(new LambdaQueryWrapperX<RobotInformationDO>()
                 .eq(RobotInformationDO::getRobotStatus, (RobotStatusEnum.STAND_BY.getType()))
                 .eq(RobotInformationDO::getRobotTaskModel, RobotTaskModelEnum.NORMAL.getType())