Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

2025-12-24 c7a31680a32a45c7d47af5162eb8edcb9824d16a

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -1,8 +1,7 @@
package com.zy.asrs.mapper;

import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Order;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -15,4 +14,20 @@

    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    List<Order> selectComplete();
    List<Order> selectComplete1();
    List<Order> selectComplete99();
    List<Order> selectComplete8();
    List<Order> selectComplete10();
    List<Order> selectComplete9();
    int addToLogTable(Order order);

    List<Order> selectorderNoL(@Param("orderNo")String orderNo);

    Order selectOrderMoveStatus();
    Order selectOrderMoveStatusInitial();

    List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);

    boolean updateOrderStatus(@Param("orderNo")String orderNo);
}