11/9 增加摆货层高度 根据货架查看摆货层和出货槽

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

@@ -4,12 +4,15 @@ 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.SysWorkplaceLayer;
+import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import com.glxp.api.req.basic.SysWorkplaceLayerRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.SysWorkplaceFreightResponse;
 import com.glxp.api.res.basic.SysWorkplaceLayerResponse;
 import com.glxp.api.service.basic.SysWorkplaceFreightService;
 import com.glxp.api.service.basic.SysWorkplaceLayerService;
+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;
@@ -32,6 +35,9 @@ public class SysWorkplaceLayerController  extends BaseController {
     @Resource
     SysWorkplaceLayerService sysWorkplaceLayerService;
 
+    @Resource
+    SysWorkplaceQueueService sysWorkplaceQueueService;
+
 
     @GetMapping("/udiwms/WorkplaceLayer/createCodeByFreightCode")
     public BaseResponse createFreightCode(String freightCode) {
@@ -61,4 +67,17 @@ public class SysWorkplaceLayerController  extends BaseController {
         Boolean save = sysWorkplaceLayerService.deleteLayer(request);
         return ResultVOUtils.success();
     }
+
+    @GetMapping("/udiwms/WorkplaceLayer/getListByFreightCode")
+    public BaseResponse getListByFreightCode(SysWorkplaceLayerRequest request) {
+        List<SysWorkplaceLayerResponse> list = sysWorkplaceLayerService.filterList(request);
+        for(SysWorkplaceLayerResponse sysWorkplaceLayer:list){
+            //查询每层摆货层下的出货槽
+            List<SysWorkplaceQueue> sysWorkplaceQueues = sysWorkplaceQueueService.getListByLayerCode(sysWorkplaceLayer.getCode());
+            sysWorkplaceLayer.setSysWorkplaceQueues(sysWorkplaceQueues);
+        }
+        //摆货层的数据有了
+        return ResultVOUtils.success(list);
+    }
+
 }

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

@@ -65,6 +65,13 @@ public class SysWorkplaceLayer implements Serializable {
     @ApiModelProperty(value = "")
     private Integer queueNum;
 
+    /**
+     * 摆货层高度
+     */
+    @TableField(value = "height")
+    @ApiModelProperty(value = "")
+    private Integer height;
+
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -22,6 +22,11 @@ public class SysWorkplaceLayerRequest extends ListPageRequest {
      * 数量
      */
     private Integer queueNum;
+
+    /**
+     * 摆货层高度
+     */
+    private Integer height;
     /**
      * 货架code
      */

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

@@ -0,0 +1,19 @@
+package com.glxp.api.res.basic;
+
+import com.glxp.api.entity.basic.SysWorkplaceFreight;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/11/8 17:57
+ * @modyified By :
+ */
+
+
+@Data
+public class ShelvesTreeResponse {
+
+    private List<SysWorkplaceFreight> sysWorkplaceFreights;
+}

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

@@ -3,10 +3,12 @@ package com.glxp.api.res.basic;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.glxp.api.entity.basic.SysWorkplaceQueue;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author : zhuzhu
@@ -66,4 +68,13 @@ public class SysWorkplaceLayerResponse {
     @ApiModelProperty(value = "")
     private Integer queueNum;
 
+
+    /**
+     * 摆货层高度
+     */
+    @TableField(value = "height")
+    @ApiModelProperty(value = "")
+    private Integer height;
+
+    private List<SysWorkplaceQueue> sysWorkplaceQueues;
 }

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

@@ -92,12 +92,16 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
                 sysWorkplaceQueueService.addLayer(sysWorkplaceQueueRequest, userId);
             }
             workplaceLayer.setQueueNum(newQueueNum);
+//            workplaceLayer.setHeight(50);
+            workplaceLayer.setUpdateTime(new Date());
+            workplaceLayer.setUpdateUser(userId + "");
             this.updateById(workplaceLayer);
             return true;
         }else {
             SysWorkplaceLayer sysWorkplaceLayer = new SysWorkplaceLayer();
             BeanUtils.copyProperties(request, sysWorkplaceLayer);
             initLayer(sysWorkplaceLayer, userId);
+            sysWorkplaceLayer.setHeight(50);
             sysWorkplaceLayerMapper.insert(sysWorkplaceLayer);
             //增加卡槽
             Integer queueNum = request.getQueueNum();
@@ -137,4 +141,6 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
         this.removeById(layer);
         return true;
     }
+
+
 }

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

@@ -12,6 +12,7 @@ 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 groovyjarjarantlr.debug.NewLineEvent;
 import org.springframework.data.annotation.Reference;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -178,4 +179,8 @@ public class SysWorkplaceQueueService extends ServiceImpl<SysWorkplaceQueueMappe
         }
         return true;
     }
+
+    public List<SysWorkplaceQueue> getListByLayerCode(String layerCode) {
+        return list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getLayerCode,layerCode));
+    }
 }

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

@@ -4688,6 +4688,13 @@ CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'assignmentTerms1',
 CALL Pro_Temp_ColumnWork('sys_workplace_queue', 'assignmentTerms2',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''分配条件2''',
                          1);
+
+CALL Pro_Temp_ColumnWork('sys_workplace_layer', 'height',
+                         'int NULL DEFAULT NULL COMMENT ''摆货层高度''',
+                         1);
+
+
+
 CALL Pro_Temp_ColumnWork('io_code_temp', 'parentCode',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''父级编码''',
                          1);