11/5 增加货架功能，优化货位1.0

src/main/java/com/glxp/api/controller/auth/SysWorkplaceFreightController.java

@@ -0,0 +1,94 @@
+package com.glxp.api.controller.auth;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.SysWorkplaceFreight;
+import com.glxp.api.entity.basic.SysWorkplaceQueue;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
+import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
+import com.glxp.api.res.basic.SysWorkplaceQueueResponse;
+import com.glxp.api.service.basic.SysWorkplaceFreightService;
+import com.glxp.api.service.basic.SysWorkplaceQueueService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/11/5 9:51
+ * @modyified By :
+ */
+
+
+@Slf4j
+@RestController
+public class SysWorkplaceFreightController extends BaseController {
+
+    @Resource
+    SysWorkplaceFreightService sysWorkplaceFreightService;
+
+
+    @GetMapping("/udiwms/WorkplaceFreight/createFreightCode")
+    public BaseResponse createFreightCode() {
+        String code = sysWorkplaceFreightService.createQueueCode();
+        return ResultVOUtils.success(code);
+    }
+
+    @PostMapping("/udiwms/WorkplaceFreight/addWorkplaceFreight")
+    public BaseResponse addWorkplaceFreight(@RequestBody SysWorkplaceFreight workplaceFreight) {
+        // 创建时间 更新时间
+        workplaceFreight.setCreateTime(new Date());
+        workplaceFreight.setCreateUser(getUserId() + "");
+        workplaceFreight.setUpdateUser(getUserId() + "");
+        workplaceFreight.setUpdateTime(new Date());
+        boolean save = sysWorkplaceFreightService.WorkplaceFreight(workplaceFreight);
+        if (!save) {
+            return ResultVOUtils.error("新增错误");
+        }
+        return ResultVOUtils.success("新增成功");
+    }
+
+    @GetMapping("/udiwms/WorkplaceFreight/getPage")
+    public BaseResponse getWorkplaceFreights(SysWorkplaceFreightRequest request) {
+        List<SysWorkplaceFreightResponse> page = sysWorkplaceFreightService.filterList(request);
+        PageInfo<SysWorkplaceFreightResponse> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<SysWorkplaceFreightResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/udiwms/WorkplaceFreight/deleteById")
+    public BaseResponse deleteByIdWorkplaceFreight(@RequestBody SysWorkplaceFreight workplaceFreight) {
+        boolean save = sysWorkplaceFreightService.removeFreight(workplaceFreight);
+        if (!save) {
+            return ResultVOUtils.error("删除错误");
+        }
+        return ResultVOUtils.success("删除成功");
+    }
+
+    @PostMapping("/udiwms/WorkplaceFreight/updateWorkplaceFreight")
+    public BaseResponse page(@RequestBody SysWorkplaceFreight workplaceFreight) {
+        workplaceFreight.setUpdateTime(new Date());
+        workplaceFreight.setUpdateUser(getUserId() + "");
+        boolean b = sysWorkplaceFreightService.updateById(workplaceFreight);
+        if (!b) {
+            return ResultVOUtils.error(500, "更新失败");
+        }
+        return ResultVOUtils.success("更新成功");
+    }
+
+
+
+}

src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java

@@ -12,8 +12,10 @@ import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
 import com.glxp.api.res.basic.SysWorkplaceQueueResponse;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.service.auth.SysWorkplaceService;
@@ -152,5 +154,28 @@ public class SysWorkplaceQueueController extends BaseController {
 
         return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
     }
+
+
+    /**
+     * 根据货架增加货位
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/sysWorkplaceQueue/add/layer")
+    public BaseResponse addLayer(@RequestBody SysWorkplaceQueueRequest request){
+        sysWorkplaceQueueService.addLayer(request,getUserId());
+        return ResultVOUtils.success("增加成功");
+    }
+
+
+    //后面做的搜索可能就得在这个接口进行修改了
+    @GetMapping("/udiwms/sysWorkplaceQueue/getQueueListByFreightCode")
+    public BaseResponse getQueueListByFreightCode(SysWorkplaceQueueRequest request) {
+        List<SysWorkplaceQueueResponse> page = sysWorkplaceQueueService.filterListFreightCode(request);
+        PageInfo<SysWorkplaceQueueResponse> pageInfo = new PageInfo<>(page);
+        PageSimpleResponse<SysWorkplaceQueueResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(page);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 }
 

src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java

@@ -0,0 +1,17 @@
+package com.glxp.api.dao.basic;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.basic.SysWorkplaceFreight;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
+import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+@Mapper
+public interface SysWorkplaceFreightMapper extends BaseMapper<SysWorkplaceFreight> {
+
+
+    List<SysWorkplaceFreightResponse> filterList(SysWorkplaceFreightRequest request);
+}

src/main/java/com/glxp/api/dao/basic/SysWorkplaceQueueMapper.java

@@ -5,6 +5,7 @@ import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
 import com.glxp.api.res.basic.SysWorkplaceQueueResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,4 +13,10 @@ import java.util.List;
 public interface SysWorkplaceQueueMapper extends BaseMapper<SysWorkplaceQueue> {
 
     List<SysWorkplaceQueueResponse> filterList(SysWorkplaceQueueRequest request);
+
+    Integer selectMaxLayer(String freightCode);
+
+    List<SysWorkplaceQueueResponse> filterListFreightCode(SysWorkplaceQueueRequest request);
+
+    Integer selectMaxGrid(@Param("freightCode") String freightCode,@Param("layer") Integer layer);
 }

src/main/java/com/glxp/api/entity/basic/SysWorkplaceFreight.java

@@ -0,0 +1,67 @@
+package com.glxp.api.entity.basic;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@ApiModel(description = "sys_workplace_freight")
+@Data
+@TableName(value = "sys_workplace_freight")
+public class SysWorkplaceFreight implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 货架编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value = "货架编码")
+    private String code;
+
+    /**
+     * 货架名称
+     */
+    @TableField(value = "`name`")
+    @ApiModelProperty(value = "货架名称")
+    private String name;
+
+    /**
+     * 工位ID
+     */
+    @TableField(value = "workPlaceIdFk")
+    @ApiModelProperty(value = "工位ID")
+    private Long workPlaceIdFk;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "")
+    private Date createTime;
+
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "")
+    private Date updateTime;
+
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value = "")
+    private String createUser;
+
+    @TableField(value = "updateUser")
+    @ApiModelProperty(value = "")
+    private String updateUser;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/entity/basic/SysWorkplaceQueue.java

@@ -21,17 +21,17 @@ public class SysWorkplaceQueue implements Serializable {
     private Integer id;
 
     /**
-     * 货架编码
+     * 货位编码
      */
     @TableField(value = "code")
-    @ApiModelProperty(value = "货架编码")
+    @ApiModelProperty(value = "货位编码")
     private String code;
 
     /**
      * 货架名称
      */
     @TableField(value = "`name`")
-    @ApiModelProperty(value = "货架名称")
+    @ApiModelProperty(value = "货位名称")
     private String name;
 
     /**
@@ -64,6 +64,30 @@ public class SysWorkplaceQueue implements Serializable {
     @ApiModelProperty(value = "")
     private String updateUser;
 
+
+    /**
+     * 货架code
+     */
+    @TableField(value = "freightCode")
+    @ApiModelProperty(value = "")
+    private String freightCode;
+
+    /**
+     * 层数标记
+     */
+    @TableField(value = "layer")
+    @ApiModelProperty(value = "")
+    private Integer layer;
+
+    /**
+     * 格数标记
+     */
+    @TableField(value = "grid")
+    @ApiModelProperty(value = "")
+    private Integer grid;
+
+
+
     @TableField(exist = false)
     private String labelId;
 

src/main/java/com/glxp/api/req/basic/SysWorkplaceFreightRequest.java

@@ -0,0 +1,22 @@
+package com.glxp.api.req.basic;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/10/30 10:42
+ * @modyified By :
+ */
+
+@Data
+public class SysWorkplaceFreightRequest extends ListPageRequest {
+    private String key;
+//    private String code;
+//    private String name;
+    private Long workPlaceIdFk;
+
+
+
+
+}

src/main/java/com/glxp/api/req/basic/SysWorkplaceQueueRequest.java

@@ -18,6 +18,19 @@ public class SysWorkplaceQueueRequest extends ListPageRequest {
     private String name;
     private Long workPlaceIdFk;
 
+    /**
+     * 格数
+     */
+    private Integer grids;
+    /**
+     * 格数
+     */
+    private Integer layer;
+    /**
+     * 货架编码
+     */
+    private String freightCode;
+
 
 
 

src/main/java/com/glxp/api/res/basic/SysWorkplaceFreightResponse.java

@@ -0,0 +1,59 @@
+package com.glxp.api.res.basic;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/11/4 11:08
+ * @modyified By :
+ */
+
+@Data
+public class SysWorkplaceFreightResponse {
+    private Integer id;
+
+    /**
+     * 货位编码
+     */
+    private String code;
+
+    /**
+     * 货位名称
+     */
+    private String name;
+
+    /**
+     * 工位ID
+     */
+    private Long workPlaceIdFk;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String createUser;
+
+
+    private String updateUser;
+
+
+    /**
+     * 所属工位
+     */
+    private String workPlaceName;
+
+
+
+
+
+}

src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java

@@ -66,4 +66,20 @@ public class SysWorkplaceQueueResponse {
     private String productName;
     private String productSpec;
 
+    /**
+     * 格数
+     */
+    private Integer layer;
+
+    /**
+     * 货架名称
+     */
+    private String freightName;
+
+    /**
+     * 货架code
+     */
+    private String freightCode;
+
+
 }

src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java

@@ -9,6 +9,7 @@ import com.glxp.api.dao.auth.SysWorkplaceDao;
 import com.glxp.api.entity.auth.SysWorkplace;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.auth.SysWorkplaceRequest;
+import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
 import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
@@ -97,4 +98,6 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
     public SysWorkplace getWorkplaceByUser(CollectOrderRequest request, Long userId) {
         return  super.baseMapper.getWorkplaceByUser(request,userId);
     }
+
+
 }

src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java

@@ -0,0 +1,80 @@
+package com.glxp.api.service.basic;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.dao.basic.SysWorkplaceFreightMapper;
+import com.glxp.api.entity.basic.SysWorkplaceFreight;
+import com.glxp.api.entity.basic.SysWorkplaceQueue;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
+import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/11/5 9:52
+ * @modyified By :
+ */
+
+@Service
+public class SysWorkplaceFreightService extends ServiceImpl<SysWorkplaceFreightMapper, SysWorkplaceFreight> {
+
+    @Resource
+    private SysWorkplaceFreightMapper sysWorkplaceFreightMapper;
+    @Resource
+    private SysWorkplaceQueueService sysWorkplaceQueueService;
+
+    public boolean WorkplaceFreight(SysWorkplaceFreight workplaceFreight) {
+        SysWorkplaceFreight sysWorkplaceFreight = sysWorkplaceFreightMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceFreight>().eq(SysWorkplaceFreight::getName, workplaceFreight.getName()));
+        if (sysWorkplaceFreight != null) {
+            throw new JsonException(500, "货架名称重复");
+        }
+        int insert = sysWorkplaceFreightMapper.insert(workplaceFreight);
+        if (insert == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    public List<SysWorkplaceFreightResponse> filterList(SysWorkplaceFreightRequest request) {
+        if (null == request) {
+            return Collections.emptyList();
+        }
+        if (null != request.getPage() && null != request.getLimit()) {
+            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
+        }
+        return sysWorkplaceFreightMapper.filterList(request);
+    }
+
+    public boolean removeFreight(SysWorkplaceFreight workplaceFreight) {
+        //如果有货位 是直接删除下面货位 还是不让删除
+        List<SysWorkplaceQueue> list = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getFreightCode, workplaceFreight.getCode()));
+        if (list.size() > 0 ){
+            throw new JsonException(500,"当前货架已有货位,请先移除货位!");
+        }
+        int i = sysWorkplaceFreightMapper.deleteById(workplaceFreight);
+        return true;
+    }
+
+    public String createQueueCode() {
+        String code;
+        SysWorkplaceFreight sysWorkplaceQueue = sysWorkplaceFreightMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceFreight>().orderByDesc(SysWorkplaceFreight::getCode).last("LIMIT 1"));
+        if (sysWorkplaceQueue == null){
+            //没有数据 新增
+            code = "DMQ00" + 1;
+        }else {
+            String code1 = sysWorkplaceQueue.getCode();
+            String withoutDMQ = code1.replace("DMQ", "");
+            Integer result = Integer.parseInt(withoutDMQ.trim());
+            result += 1;
+            String sixDigitResult = String.format("%03d", result);
+            code = "DMQ" + sixDigitResult;
+        }
+        return code;
+    }
+}

src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java

@@ -4,9 +4,12 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.SysWorkplaceFreightRequest;
 import com.glxp.api.req.basic.SysWorkplaceQueueRequest;
+import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
 import com.glxp.api.res.basic.SysWorkplaceQueueResponse;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
+import com.glxp.api.task.SyncThirdSysTask;
 import org.springframework.data.annotation.Reference;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,7 +17,9 @@ import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.dao.basic.SysWorkplaceQueueMapper;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -54,7 +59,7 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     public boolean saveQueue(SysWorkplaceQueue sysWorkplaceQueue) {
         SysWorkplaceQueue sysWorkplaceQueue1 = sysWorkplaceQueueMapper.selectOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getName, sysWorkplaceQueue.getName()));
         if (sysWorkplaceQueue1 != null) {
-            throw new JsonException(500, "当前分格已存在");
+            throw new JsonException(500, "当前货位名称已存在");
         }
         int insert = sysWorkplaceQueueMapper.insert(sysWorkplaceQueue);
         if (insert == 0) {
@@ -64,5 +69,77 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
     }
 
 
+    public void addLayer(SysWorkplaceQueueRequest request, Long userId) {
+        Integer grid = request.getGrids();
+//        List<SysWorkplaceQueue> sysWorkplaceQueues = new ArrayList<>();
+        //当前最大层数
+        Integer layer = getLayer(request.getFreightCode());
+        for (int n = 1; n <= grid; n++) {
+            String result = String.format("%02d", layer);
+            SysWorkplaceQueue sysWorkplaceQueue = new SysWorkplaceQueue();
+            sysWorkplaceQueue.setFreightCode(request.getFreightCode());
+//            sysWorkplaceQueue.setLayer(getLayer(request.getFreightCode()));
+            sysWorkplaceQueue.setLayer(layer);
+            sysWorkplaceQueue.setGrid(Integer.valueOf(createGrid(request.getFreightCode(), layer)));
+            sysWorkplaceQueue.setCode(request.getFreightCode() + result + createGrid(request.getFreightCode(), layer));
+            sysWorkplaceQueue.setCreateUser(userId + "");
+            sysWorkplaceQueue.setCreateTime(new Date());
+            sysWorkplaceQueue.setUpdateTime(new Date());
+            sysWorkplaceQueue.setUpdateUser(userId + "");
+//            sysWorkplaceQueues.add(sysWorkplaceQueue);
+            sysWorkplaceQueueMapper.insert(sysWorkplaceQueue);
+        }
+
+
+    }
+
+    private String createGrid(String freightCode, Integer layer) {
+        Integer grid = sysWorkplaceQueueMapper.selectMaxGrid(freightCode, layer);
+        if (grid == null) {
+            grid = 1;
+        } else {
+            grid += 1;
+        }
+        String result = String.format("%02d", grid);
+        return result;
+    }
+
 
+    public Integer getLayer(String freightCode) {
+        Integer layer = sysWorkplaceQueueMapper.selectMaxLayer(freightCode);
+        if (layer == null) {
+            layer = 1;
+        } else {
+            layer += 1;
+        }
+        return layer;
+    }
+
+    /**
+     * 层号
+     *
+     * @param freightCode
+     * @return
+     */
+    public String createLayer(String freightCode) {
+        //编号 自动生成四位数 + 层号 + 格号
+        Integer layer = getLayer(freightCode);
+        String result = String.format("%02d", layer);
+        return result;
+    }
+
+
+    public List<SysWorkplaceQueueResponse> filterListFreightCode(SysWorkplaceQueueRequest request) {
+        if (null == request) {
+            return Collections.emptyList();
+        }
+        if (null != request.getPage() && null != request.getLimit()) {
+            PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit());
+        }
+        List<SysWorkplaceQueueResponse> sysWorkplaceQueueResponses = sysWorkplaceQueueMapper.filterListFreightCode(request);
+//        for (SysWorkplaceQueueResponse sysWorkplaceQueueResponse : sysWorkplaceQueueResponses){
+//            sysWorkplaceQueueResponse.setCode(sysWorkplaceQueueResponse.getFreightCode() +sysWorkplaceQueueResponse.getCode());
+//        }
+        return sysWorkplaceQueueResponses;
+    }
 }

src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.basic.SysWorkplaceFreightMapper">
+
+
+    <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceFreightResponse">
+        select swf.*,
+        sw.workplaceName  workPlaceName
+        from sys_workplace_freight swf
+        left join sys_workplace sw on sw.workplaceId = swf.workPlaceIdFk
+        <where>
+            <if test="key != null and key != ''">
+                AND (
+                swf.code like concat('%', #{key}, '%')
+                or swf.name like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test=" workPlaceIdFk != null and workPlaceIdFk != ''">
+                AND swf.workPlaceIdFk = #{workPlaceIdFk}
+            </if>
+        </where>
+    </select>
+</mapper>

src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml

@@ -41,5 +41,42 @@
         GROUP BY sq.code
         ORDER BY sq.code
     </select>
+    <select id="selectMaxLayer" resultType="java.lang.Integer">
+        select max(layer) as layer from sys_workplace_queue
+        <where>
+            <if test=" freightCode != null and freightCode != ''">
+                AND freightCode = #{freightCode}
+            </if>
+        </where>
+    </select>
+
+    <select id="filterListFreightCode" resultType="com.glxp.api.res.basic.SysWorkplaceQueueResponse">
+        select swq.*,
+        swf.name freightName
+        from sys_workplace_queue swq
+        left join sys_workplace_freight swf on swf.code = swq.freightCode
+        <where>
+            <if test="key != null and key != ''">
+                AND (
+                swq.code like concat('%', #{key}, '%')
+                or swq.name like concat('%', #{key}, '%')
+                )
+            </if>
+            <if test=" freightCode != null and freightCode != ''">
+                AND freightCode = #{freightCode}
+            </if>
+        </where>
+    </select>
+    <select id="selectMaxGrid" resultType="java.lang.Integer">
+        select max(grid) as grid from sys_workplace_queue
+        <where>
+            <if test=" freightCode != null and freightCode != ''">
+                AND freightCode = #{freightCode}
+            </if>
+            <if test=" layer != null and layer != ''">
+                AND layer = #{layer}
+            </if>
+        </where>
+    </select>
 
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -4571,8 +4571,8 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'drugLink',
 CREATE TABLE IF NOT EXISTS `sys_workplace_queue`
 (
     `id`            int                                                           NOT NULL AUTO_INCREMENT,
-    `code`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货架编码',
+    `code`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位编码',
-    `name`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货架名称',
+    `name`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货位名称',
     `workPlaceIdFk` bigint                                                        NULL DEFAULT NULL COMMENT '工位ID',
     `remark`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
     `createTime`    datetime(0)                                                   NULL DEFAULT NULL,
@@ -4605,6 +4605,33 @@ CALL Pro_Temp_ColumnWork('sys_workplace', 'queueStatus',
                          1);
 
 
+CREATE TABLE IF NOT EXISTS `sys_workplace_freight`  (
+                                          `id` int NOT NULL AUTO_INCREMENT,
+                                          `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货架编码',
+                                          `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '货架名称',
+                                          `workPlaceIdFk` bigint NULL DEFAULT NULL COMMENT '工位ID',
+                                          `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+                                          `createTime` datetime NULL DEFAULT NULL,
+                                          `updateTime` datetime NULL DEFAULT NULL,
+                                          `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                          `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                          PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'layer',
+                         'int NULL DEFAULT NULL COMMENT ''层级标记''',
+                         1);
+CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'grid',
+                         'int NULL DEFAULT NULL COMMENT ''格层标记''',
+                         1);
+
+
+
 CALL Pro_Temp_ColumnWork('io_collect_set', 'lastCodeSplit',
                          ' tinyint NULL DEFAULT b''1''COMMENT ''是否最后追溯码拆零0:关闭 1:启用''',
                          1);