Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

zhang

2025-07-03 74546b829d63fd3ff7f625d5906536dbab511161

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

@@ -15,5 +15,12 @@
    int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);

    List<Order> selectComplete();
    List<Order> selectComplete8();

    int addToLogTable(Order order);

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

    Order selectOrderMoveStatus();
    Order selectOrderMoveStatusInitial();
}