Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms

野心家

11 小时以前 5127f46eedeede5cbfeae7a4908ddac11d332494

 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();
}