27. 新增上移,下移,置顶,置底接口,实现业务逻辑检索,依次排序,交换层号等功能

26.	修改批量入库接口,新加功能,查询库中当前垛位下最大层号,依次排序,添加到入库表,库存表
25.	垛位管理页面新增单击查询该垛位下库存信息
20.	库房管理系统,新增批量新增垛位功能,根据起始数量,其实编号,新增垛位前缀来进行编排的批量操作
19.	库房管理系统,调试保存或修改垛位接口,修复bug

sto/src/main/java/com/shinsoft/sto/controller/main/WareController.java

@@ -102,5 +102,23 @@ public class WareController {
             return resultJSON;
         }
     }
+
+    /**
+     * 根据仓库id与垛位id查询垛位下库存信息
+     */
+    @RequestMapping("/getWares")
+    public ResultJSON getWares(@RequestParam("wareId") String wareId,@RequestParam("stackId") String stackId, HttpServletRequest request) {
+        try {
+            String belongId = request.getHeader("belongId");
+            resultJSON = wareService.getWares(wareId, stackId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
+        } finally {
+            return resultJSON;
+        }
+    }
+
+
 }
 

sto/src/main/java/com/shinsoft/sto/controller/ware/StoreChangeController.java

@@ -3,6 +3,8 @@ package com.shinsoft.sto.controller.ware;
 import com.alibaba.fastjson.JSON;
 import com.shinsoft.sto.model.system.ResultJSON;
 import com.shinsoft.sto.service.ware.StoreChangeService;
+import com.shinsoft.tools.JSONTools;
+import com.shinsoft.tools.model.common.ResponseCodeMsg;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -41,5 +43,59 @@ public class StoreChangeController {
         }
         return map;
     }
+
+    /**
+     * 层号上移
+     */
+    @RequestMapping("/moveUp")
+    public ResultJSON moveUp(@RequestParam("wareId") String wareId, @RequestParam("stackId") String stackId, @RequestParam("prodId") String prodId, @RequestParam("layerNo") String layerNo, HttpServletRequest request) {
+        try {
+            String belongId = request.getHeader("belongId");
+            return storeChangeService.moveUp(wareId, stackId, prodId, layerNo, belongId);
+        } catch (Exception ex) {
+            return ResultJSON.error("上移失败"+ex.getMessage());
+        }
+    }
+
+    /**
+     * 层号下移
+     */
+    @RequestMapping("/moveDown")
+    public ResultJSON moveDown(@RequestParam("wareId") String wareId, @RequestParam("stackId") String stackId, @RequestParam("prodId") String prodId, @RequestParam("layerNo") String layerNo, HttpServletRequest request) {
+        try {
+            String belongId = request.getHeader("belongId");
+            return storeChangeService.moveDown(wareId, stackId, prodId, layerNo, belongId);
+        } catch (Exception ex) {
+            return ResultJSON.error("下移失败"+ex.getMessage());
+        }
+    }
+
+    /**
+     * 层号置顶
+     */
+    @RequestMapping("/moveTop")
+    public ResultJSON moveTop(@RequestParam("wareId") String wareId, @RequestParam("stackId") String stackId, @RequestParam("prodId") String prodId, @RequestParam("layerNo") String layerNo, HttpServletRequest request) {
+        try {
+            String belongId = request.getHeader("belongId");
+            return storeChangeService.moveTop(wareId, stackId, prodId, layerNo, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("置顶失败"+ex.getMessage());
+        }
+    }
+
+    /**
+     * 层号置底
+     */
+    @RequestMapping("/moveBottom")
+    public ResultJSON moveBottom(@RequestParam("wareId") String wareId, @RequestParam("stackId") String stackId, @RequestParam("prodId") String prodId, @RequestParam("layerNo") String layerNo, HttpServletRequest request) {
+        try {
+            String belongId = request.getHeader("belongId");
+           return storeChangeService.moveBottom(wareId, stackId, prodId, layerNo, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("置底失败"+ex.getMessage());
+        }
+    }
 }
 

sto/src/main/java/com/shinsoft/sto/mapper/main/WareMapper.java

@@ -3,6 +3,8 @@ package com.shinsoft.sto.mapper.main;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.shinsoft.sto.model.common.selectModel;
 import com.shinsoft.sto.model.main.Ware;
+import com.shinsoft.sto.model.record.ImportModel;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,4 +15,6 @@ public interface WareMapper extends BaseMapper<Ware> {
     List<selectModel> selectWareOptions();
     Ware selectByWareId(String wareId, String userId, String belongId);
 
+    List<ImportModel> selectImportModel(@Param("wareId") String wareId, @Param("stackId") String stackId,@Param("belongId") String belongId);
+
 }

sto/src/main/java/com/shinsoft/sto/mapper/main/WareMapper.xml

@@ -78,4 +78,48 @@ and t.id =   #{param1,jdbcType=VARCHAR}
 and  t.belong_id = #{param3,jdbcType=VARCHAR}
     and ifnull(t.cancel_flag,'0') = '0'
   </select>
+
+    <select id="selectImportModel">
+        select
+            t2.PROD_NO prodNo,
+            t2.ST_GRADE stGrade,
+            T2.WEIGHT weight,
+            T2.QUANTITY quantity,
+            T2.DELIVERY_ADDRESS,
+            T2.IN_TRUCK_NO inTruckNo,
+            T2.IN_DTM inDtm,
+            T2.IN_USER_NAME inUser,
+            T2.LOCK_FLAG lockFlag,
+            T2.ATTRIB_01 attrib01,
+            T2.ATTRIB_02 attrib02,
+            T2.ATTRIB_03 attrib03,
+            T2.ATTRIB_04 attrib04,
+            T2.ATTRIB_05 attrib05,
+            T3.CUSTOMER_NM AS ownerCompany,
+            T4.CUSTOMER_NM AS receivingCompany,
+            T5.CUSTOMER_NM AS customerCompanyName,
+            T6.WARE_NM wareName,
+            t7.NAME stackName,
+            T1.LAYER_NO layerNo,
+            T1.STACK_ID,
+            T1.WARE_ID,
+            T8.MATERIAL_NAME materialName,
+            T2.ID prodId
+        from T_WARE_STORE t1
+                 LEFT JOIN T_PROD_MASTER T2 ON T2.ID = T1.STORE_ID
+                 LEFT JOIN T_MAIN_CUSTOMER T3 ON T3.ID = T2.OWNER_COMPANY
+                 LEFT JOIN T_MAIN_CUSTOMER T4 ON T4.ID = T2.RECEIVING_COMPANY
+                 LEFT JOIN T_MAIN_CUSTOMER T5 ON T5.ID = T2.CUSTOMER_COMPANY
+                 LEFT JOIN T_MAIN_WARE T6 ON T6.ID = T1.WARE_ID
+                 LEFT JOIN T_MAIN_STACK T7 ON T7.ID = T1.STACK_ID
+                 LEFT JOIN T_MAIN_MATERIAL T8 ON T8.ID = T2.MATERIAL_ID
+        WHERE
+            t1.STACK_ID = #{stackId}
+          and t1.WARE_ID = #{wareId}
+          and t1.BELONG_ID = #{belongId}
+          AND T2.IN_FLAG = '0'
+          AND T2.OUT_FLAG = '0'
+          AND T2.CANCEL_FLAG = '0'
+        order by t1.LAYER_NO desc
+    </select>
 </mapper>

sto/src/main/java/com/shinsoft/sto/mapper/ware/StoreChangeMapper.java

@@ -12,5 +12,7 @@ public interface StoreChangeMapper extends BaseMapper<StoreChange> {
 
     IPage<StoreChange> selectStoreChangePage(Page<StoreChange> page,
                                              @Param("parms") Map<String, Object> map);
+
+    Integer selectMaxLayerNoByWareAndStack(@Param("wareId") String wareId,@Param("stackId") String stackId,@Param("belongId") String belongId);
 }
 

sto/src/main/java/com/shinsoft/sto/mapper/ware/StoreChangeMapper.xml

@@ -39,5 +39,18 @@
         <include refid="QueryWhere"/>
         order by ws.id desc
     </select>
+    <select id="selectMaxLayerNoByWareAndStack">
+        SELECT MAX(TO_NUMBER(layer_no))
+        FROM (
+                 SELECT layer_no
+                 FROM T_WARE_STORE
+                 WHERE ware_id = #{wareId}
+                   AND stack_id = #{stackId}
+                   AND belong_id = #{belongId}
+                   AND CANCEL_FLAG = '0'
+                 ORDER BY TO_NUMBER(layer_no) DESC
+             )
+        WHERE ROWNUM = 1
+    </select>
 </mapper>
 

sto/src/main/java/com/shinsoft/sto/model/record/ImportModel.java

@@ -1,11 +1,13 @@
 package com.shinsoft.sto.model.record;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.sf.jsqlparser.util.validation.Validation;
 
 import java.math.BigDecimal;
 
@@ -83,12 +85,30 @@ public class ImportModel {
     @ColumnWidth(15)
     private String remark1;
 
-//    @ExcelProperty(value = "垛位备注", index = 18)
-//    @ColumnWidth(15)
-//    private String remark2;
-
     @ExcelProperty(value = "入库/理货人员", index = 18)
     @ColumnWidth(20)
     private String inUser;
+
+
+
+    @ExcelIgnore
+    private String inDtm;
+
+    @ExcelIgnore
+    private String lockFlag;
+
+    @ExcelIgnore
+    private String customerCompanyName;
+
+    @ExcelIgnore
+    private String wareId;
+
+    @ExcelIgnore
+    private String stackId;
+
+    @ExcelIgnore
+    private String prodId;
+
+
 //
 }

sto/src/main/java/com/shinsoft/sto/service/impl/main/WareServiceImp.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.shinsoft.sto.mapper.main.WareMapper;
 import com.shinsoft.sto.model.common.selectModel;
 import com.shinsoft.sto.model.main.Ware;
+import com.shinsoft.sto.model.record.ImportModel;
 import com.shinsoft.sto.service.main.WareService;
 import com.shinsoft.tools.JSONTools;
 import com.shinsoft.tools.model.common.ResultJSON;
@@ -121,5 +122,12 @@ public class WareServiceImp extends ServiceImpl<WareMapper, Ware> implements War
         resultJSON = JSONTools.toResultJSON(options);
         return resultJSON;
     }
+
+    @Override
+    public ResultJSON getWares(String wareId, String stackId, String belongId) {
+        List<ImportModel> importModels = wareMapper.selectImportModel(wareId, stackId, belongId);
+        return JSONTools.toResultJSON(importModels);
+    }
+
 }
 

sto/src/main/java/com/shinsoft/sto/service/impl/record/InrecordServiceImpl.java

@@ -95,6 +95,20 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
             if(ObjectUtils.isEmpty(dataList)){
                 return ResultJSON.error(ResponseCodeMsg.CODE_EX, "数据为空");
             }
+//            根据层号正排序
+            // 根据层号正排序（数值排序）
+            dataList.sort((o1, o2) -> {
+                try {
+                    Integer num1 = Integer.parseInt(o1.getLayerNo());
+                    Integer num2 = Integer.parseInt(o2.getLayerNo());
+                    return num1.compareTo(num2);
+                } catch (NumberFormatException e) {
+                    // 如果解析失败，回退到字符串比较
+                    String layerNo1 = o1.getLayerNo();
+                    String layerNo2 = o2.getLayerNo();
+                    return layerNo1 != null ? layerNo1.compareTo(layerNo2) : 0;
+                }
+            });
             for (ImportModel model : dataList){
                 /**
                  * 数据校验
@@ -171,7 +185,7 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
                     return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
                 }
 //                拼接入库记录
-                Inrecord inrecord = inRecordSplice(model, userId, belongId,material,customer,customer1,userName);
+                Inrecord inrecord = inRecordSplice(model, userId, belongId,material,customer,customer1,userName,ware,stack);
                 int insert1 = inrecordMapper.insert(inrecord);
                 if (insert1 <= 0) {
                     return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
@@ -200,6 +214,7 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
     /**
      * 拼接材料信息
      */
+    @Transactional(rollbackFor = Exception.class)
     public ProdMaster prodSplice(ImportModel importModel,String userId,String belongId,Material material,Customer customer,Customer customer1,String userName){
         ProdMaster prodMaster = new ProdMaster();
         prodMaster.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -242,7 +257,8 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
     /**
      * 拼接入库记录
      */
-    public Inrecord inRecordSplice(ImportModel importModel,String userId,String belongId,Material material,Customer customer,Customer customer1,String userName){
+    @Transactional(rollbackFor = Exception.class)
+    public Inrecord inRecordSplice(ImportModel importModel,String userId,String belongId,Material material,Customer customer,Customer customer1,String userName,Ware ware,Stack stack){
         Inrecord inrecord = new Inrecord();
         inrecord.setAddId(userId);
         inrecord.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -250,7 +266,7 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
         inrecord.setBelongId(belongId);
         inrecord.setInWareName(importModel.getWareName());
         inrecord.setInStackName(importModel.getStackName());
-        inrecord.setInLayerNo(importModel.getLayerNo());
+
         inrecord.setProdNo(importModel.getProdNo());
         inrecord.setOwnerCompany(customer.getId());
         inrecord.setReceivingCompany(customer1.getId());
@@ -270,12 +286,22 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
         }else{
             inrecord.setTallyPeople(userName);
         }
+        // 根据仓库id和垛位id查询最大层号
+        Integer maxLayerNo = storeChangeMapper.selectMaxLayerNoByWareAndStack(ware.getId(), stack.getId(),belongId);
+        Integer newLayerNo = null;
+        if (maxLayerNo == null) {
+            newLayerNo = 1; // 如果没有现有层号，则从第1层开始
+        } else {
+            newLayerNo = maxLayerNo + 1; // 否则在最大层号基础上加1
+        }
+        inrecord.setInLayerNo(String.valueOf(newLayerNo));
         return inrecord;
     }
 
     /**
      * 拼接库存信息
      */
+    @Transactional(rollbackFor = Exception.class)
     public StoreChange storeChangeSplice(ImportModel importModel,String userId,String belongId,ProdMaster prodMaster,String userName,Ware ware,Stack stack){
         StoreChange storeChange = new StoreChange();
         storeChange.setId(UUID.randomUUID().toString().replace("-", ""));
@@ -289,18 +315,28 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
         storeChange.setAddTime(new Date());
         storeChange.setBelongId(belongId);
         storeChange.setCancelFlag("0");
-        storeChange.setLayerNo(importModel.getLayerNo());
         if(importModel.getInUser()!=null){
             storeChange.setAddName(importModel.getInUser());
         }else{
             storeChange.setAddName(userName);
         }
+// 根据仓库id和垛位id查询最大层号
+        Integer maxLayerNo = storeChangeMapper.selectMaxLayerNoByWareAndStack(ware.getId(), stack.getId(),belongId);
+        Integer newLayerNo = null;
+        if (maxLayerNo == null) {
+            newLayerNo = 1; // 如果没有现有层号，则从第1层开始
+        } else {
+            newLayerNo = maxLayerNo + 1; // 否则在最大层号基础上加1
+        }
+        storeChange.setLayerNo(newLayerNo.toString()); // 设置新的层号
+
         return storeChange;
     }
 
     /**
      * 拼接操作记录
      */
+    @Transactional(rollbackFor = Exception.class)
     public ChangeRecord changeRecordSplice(ImportModel importModel,String userId,String belongId,Customer customer,Customer customer1,String userName,Material material,ProdMaster prodMaster){
         ChangeRecord changeRecord = new ChangeRecord();
         changeRecord.setId(UUID.randomUUID().toString().replace("-", ""));

sto/src/main/java/com/shinsoft/sto/service/impl/ware/StoreChangeServiceImpl.java

@@ -1,5 +1,7 @@
 package com.shinsoft.sto.service.impl.ware;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,12 +11,15 @@ import com.shinsoft.sto.model.system.ResponseCodeMsg;
 import com.shinsoft.sto.model.system.ResultJSON;
 import com.shinsoft.sto.service.ware.StoreChangeService;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
 public class StoreChangeServiceImpl extends ServiceImpl<StoreChangeMapper, StoreChange> implements StoreChangeService {
 
+
     @Override
     public ResultJSON query(int page, int rows, Map<String, Object> map) {
         try {
@@ -26,5 +31,292 @@ public class StoreChangeServiceImpl extends ServiceImpl<StoreChangeMapper, Store
             return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
         }
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON moveUp(String wareId, String stackId, String prodId, String layerNo, String belongId) {
+        try {
+            // 参数验证
+            if (StringUtils.isEmpty(wareId) || StringUtils.isEmpty(stackId) ||
+                    StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(belongId)) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "必要参数不能为空");
+            }
+
+            // 查询目标层数据
+            StoreChange targetLayer = baseMapper.selectOne(new QueryWrapper<StoreChange>()
+                    .eq("ware_id", wareId)
+                    .eq("stack_id", stackId)
+                    .eq("layer_no", layerNo)
+                    .eq("cancel_flag", "0")
+                    .eq("belong_id", belongId));
+
+            if (targetLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "目标层数据不存在");
+            }
+
+            // 查询上一层数据
+            StoreChange upperLayer = baseMapper.selectOne(new QueryWrapper<StoreChange>()
+                    .eq("ware_id", wareId)
+                    .eq("stack_id", stackId)
+                    .eq("layer_no", String.valueOf(Integer.parseInt(layerNo) + 1))
+                    .eq("cancel_flag", "0")
+                    .eq("belong_id", belongId));
+
+            if (upperLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "上层数据不存在，无法上移");
+            }
+
+            // 交换层号
+            String originalTargetLayerNo = targetLayer.getLayerNo();
+            String originalUpperLayerNo = upperLayer.getLayerNo();
+
+            // 更新目标层为上一层的层号
+            StoreChange updateTarget = new StoreChange();
+            updateTarget.setId(targetLayer.getId());
+            updateTarget.setLayerNo(originalUpperLayerNo);
+            int updateResult1 = baseMapper.updateById(updateTarget);
+
+            // 更新上一层为目标层的层号
+            StoreChange updateUpper = new StoreChange();
+            updateUpper.setId(upperLayer.getId());
+            updateUpper.setLayerNo(originalTargetLayerNo);
+            int updateResult2 = baseMapper.updateById(updateUpper);
+
+            if (updateResult1 <= 0 || updateResult2 <= 0) {
+                throw new RuntimeException("上移失败");
+            }
+
+            return ResultJSON.success("上移成功");
+
+        } catch (NumberFormatException e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号格式错误");
+        } catch (Exception e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号交换失败: " + e.getMessage());
+        }
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON moveDown(String wareId, String stackId, String prodId, String layerNo, String belongId) {
+        try {
+            // 参数验证
+            if (StringUtils.isEmpty(wareId) || StringUtils.isEmpty(stackId) ||
+                    StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(belongId)) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "必要参数不能为空");
+            }
+
+            // 查询目标层数据
+            StoreChange targetLayer = baseMapper.selectOne(new QueryWrapper<StoreChange>()
+                    .eq("ware_id", wareId)
+                    .eq("stack_id", stackId)
+                    .eq("layer_no", layerNo)
+                    .eq("cancel_flag", "0")
+                    .eq("belong_id", belongId));
+
+            if (targetLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "目标层数据不存在");
+            }
+
+            // 查询上一层数据
+            StoreChange upperLayer = baseMapper.selectOne(new QueryWrapper<StoreChange>()
+                    .eq("ware_id", wareId)
+                    .eq("stack_id", stackId)
+                    .eq("layer_no", String.valueOf(Integer.parseInt(layerNo) - 1))
+                    .eq("cancel_flag", "0")
+                    .eq("belong_id", belongId));
+
+            if (upperLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "下层数据不存在，无法下移");
+            }
+
+            // 交换层号
+            String originalTargetLayerNo = targetLayer.getLayerNo();
+            String originalUpperLayerNo = upperLayer.getLayerNo();
+
+            // 更新目标层为上一层的层号
+            StoreChange updateTarget = new StoreChange();
+            updateTarget.setId(targetLayer.getId());
+            updateTarget.setLayerNo(originalUpperLayerNo);
+            int updateResult1 = baseMapper.updateById(updateTarget);
+
+            // 更新上一层为目标层的层号
+            StoreChange updateUpper = new StoreChange();
+            updateUpper.setId(upperLayer.getId());
+            updateUpper.setLayerNo(originalTargetLayerNo);
+            int updateResult2 = baseMapper.updateById(updateUpper);
+
+            if (updateResult1 <= 0 || updateResult2 <= 0) {
+                throw new RuntimeException("下移失败");
+            }
+
+            return ResultJSON.success("下移成功");
+
+        } catch (NumberFormatException e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号格式错误");
+        } catch (Exception e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号交换失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON moveTop(String wareId, String stackId, String prodId, String layerNo, String belongId) {
+        try {
+            // 参数验证
+            if (StringUtils.isEmpty(wareId) || StringUtils.isEmpty(stackId) ||
+                    StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(belongId)) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "必要参数不能为空");
+            }
+
+            // 验证层号是否为有效数字
+            int currentLayerNo;
+            try {
+                currentLayerNo = Integer.parseInt(layerNo);
+            } catch (NumberFormatException e) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号格式错误");
+            }
+
+            // 查询当前垛位的所有有效层数据，按层号升序排列
+            List<StoreChange> allLayers = baseMapper.selectList(
+                    new QueryWrapper<StoreChange>()
+                            .eq("ware_id", wareId)
+                            .eq("stack_id", stackId)
+                            .eq("cancel_flag", "0")
+                            .eq("belong_id", belongId)
+                            .orderByAsc("layer_no"));
+
+            if (allLayers.isEmpty()) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "该垛位无有效数据");
+            }
+
+            // 查找当前层的记录
+            StoreChange currentLayer = null;
+            int currentIndex = -1;
+            for (int i = 0; i < allLayers.size(); i++) {
+                if (currentLayerNo == Integer.parseInt(allLayers.get(i).getLayerNo())) {
+                    currentLayer = allLayers.get(i);
+                    currentIndex = i;
+                    break;
+                }
+            }
+
+            if (currentLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "当前层数据不存在");
+            }
+
+            // 如果已经在顶层（最大层号），则无需移动
+            int maxLayerIndex = allLayers.size() - 1;
+            if (currentIndex == maxLayerIndex) {
+                return ResultJSON.success("已在顶层，无需移动");
+            }
+
+            // 开始批量更新层号：将目标层移到顶层，其他层号依次调整
+            for (int i = currentIndex; i < maxLayerIndex; i++) {
+                StoreChange layerToMove = allLayers.get(i + 1);
+                StoreChange update = new StoreChange();
+                update.setId(layerToMove.getId());
+                update.setLayerNo(String.valueOf(Integer.parseInt(layerToMove.getLayerNo()) - 1)); // 层号减1
+                int result = baseMapper.updateById(update);
+                if (result <= 0) {
+                    throw new RuntimeException("更新层号失败");
+                }
+            }
+
+            // 将目标层设置为新的最大层号
+            StoreChange updateCurrent = new StoreChange();
+            updateCurrent.setId(currentLayer.getId());
+            updateCurrent.setLayerNo(String.valueOf(Integer.parseInt(allLayers.get(maxLayerIndex).getLayerNo())));
+            int result = baseMapper.updateById(updateCurrent);
+            if (result <= 0) {
+                throw new RuntimeException("更新目标层号失败");
+            }
+
+            return ResultJSON.success("移动到顶层成功");
+
+        } catch (Exception e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "移动到顶层失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultJSON moveBottom(String wareId, String stackId, String prodId, String layerNo, String belongId) {
+        try {
+            // 参数验证
+            if (StringUtils.isEmpty(wareId) || StringUtils.isEmpty(stackId) ||
+                    StringUtils.isEmpty(layerNo) || StringUtils.isEmpty(belongId)) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "必要参数不能为空");
+            }
+
+            // 验证层号是否为有效数字
+            int currentLayerNo;
+            try {
+                currentLayerNo = Integer.parseInt(layerNo);
+            } catch (NumberFormatException e) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "层号格式错误");
+            }
+
+            // 查询当前垛位的所有有效层数据，按层号升序排列
+            List<StoreChange> allLayers = baseMapper.selectList(
+                    new QueryWrapper<StoreChange>()
+                            .eq("ware_id", wareId)
+                            .eq("stack_id", stackId)
+                            .eq("cancel_flag", "0")
+                            .eq("belong_id", belongId)
+                            .orderByAsc("layer_no"));
+
+            if (allLayers.isEmpty()) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "该垛位无有效数据");
+            }
+
+            // 查找当前层的记录
+            StoreChange currentLayer = null;
+            int currentIndex = -1;
+            for (int i = 0; i < allLayers.size(); i++) {
+                if (currentLayerNo == Integer.parseInt(allLayers.get(i).getLayerNo())) {
+                    currentLayer = allLayers.get(i);
+                    currentIndex = i;
+                    break;
+                }
+            }
+
+            if (currentLayer == null) {
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "当前层数据不存在");
+            }
+
+            // 如果已经在底层（最小层号），则无需移动
+            if (currentIndex == 0) {
+                return ResultJSON.success("已在底层，无需移动");
+            }
+
+            // 开始批量更新层号：将目标层移到底层，其他层号依次调整
+            for (int i = currentIndex; i > 0; i--) {
+                StoreChange layerToMove = allLayers.get(i - 1);
+                StoreChange update = new StoreChange();
+                update.setId(layerToMove.getId());
+                update.setLayerNo(String.valueOf(Integer.parseInt(layerToMove.getLayerNo()) + 1)); // 层号加1
+                int result = baseMapper.updateById(update);
+                if (result <= 0) {
+                    throw new RuntimeException("更新层号失败");
+                }
+            }
+
+            // 将目标层设置为新的最小层号（1）
+            StoreChange updateCurrent = new StoreChange();
+            updateCurrent.setId(currentLayer.getId());
+            updateCurrent.setLayerNo("1"); // 设置为最小层号
+            int result = baseMapper.updateById(updateCurrent);
+            if (result <= 0) {
+                throw new RuntimeException("更新目标层号失败");
+            }
+
+            return ResultJSON.success("移动到底层成功");
+
+        } catch (Exception e) {
+            return ResultJSON.error(ResponseCodeMsg.CODE_EX, "移动到底层失败: " + e.getMessage());
+        }
+    }
+
 }
 

sto/src/main/java/com/shinsoft/sto/service/main/WareService.java

@@ -27,5 +27,9 @@ public interface WareService extends IService<Ware> {
     ResultJSON removeBatch(String userId, String ids);
 
     ResultJSON getWareOptions();
+
+    ResultJSON getWares(String wareId,String stackId,String belongId);
+
+
 }
 

sto/src/main/java/com/shinsoft/sto/service/ware/StoreChangeService.java

@@ -8,5 +8,13 @@ public interface StoreChangeService {
     ResultJSON query(int page,
                      int rows,
                      Map<String, Object> map);
+
+    ResultJSON moveUp(String wareId, String stackId, String prodId, String layerNo, String belongId);
+
+    ResultJSON moveDown(String wareId, String stackId, String prodId, String layerNo, String belongId);
+
+    ResultJSON moveTop(String wareId, String stackId, String prodId, String layerNo, String belongId);
+
+    ResultJSON moveBottom(String wareId, String stackId, String prodId, String layerNo, String belongId);
 }